diff --git a/common/guids.csv b/common/guids.csv
index a100ad8..c60aaf8 100644
--- a/common/guids.csv
+++ b/common/guids.csv
@@ -8,7 +8,7 @@
 0053D9D6-2659-4599-A26B-EF4536E631A9,ShellAliasGuid
 0065D394-9951-4144-82A3-0AFC8579C251,EfiPeiRscHandlerPpiGuid
 00720665-67EB-4A99-BAF7-D3C33A1C7CC9,EfiTcp4ServiceBindingProtocolGuid
-00781CA1-5DE3-405F-ABB8-379C3C076984,gAmiRomLayoutGuid
+00781CA1-5DE3-405F-ABB8-379C3C076984,AmiRomLayoutGuid
 00B46EC9-2712-486B-A6A4-E2933581C28B,HstiPlatformDxe
 00C86DB8-013B-4FF4-B8E9-208F4FCF1C00,LibSignal
 00CA959F-6CFA-4DB1-95BC-E46C47514390,EfiTlsProtocolGuid
@@ -17,7 +17,7 @@
 010216CD-9C09-4EB5-B7DA-D0A2865092D4,ProjectDXE
 01359D99-9446-456D-ADA4-50A711C03ADA,CpuInitPei
 01359D99-9446-456D-ADA4-50A711C03ADB,CpuPeim
-01368881-C4AD-4B1D-B631-D57A8EC8DB6B,gAmiGlobalVariableGuid
+01368881-C4AD-4B1D-B631-D57A8EC8DB6B,AmiGlobalVariableGuid
 0154DD51-9079-4A10-895C-9C0772815788,PlatformBootManagerStringPackGuid
 01631791-F34E-4C0A-B15D-0B6CE22B27A8,TcgPeiAfterMem
 0167CCC4-D0F7-4F21-A3EF-9E64B7CDCE8B,ScsiBus
@@ -32,27 +32,27 @@
 021722D8-522B-4079-852A-FE44C2C13F49,SataController
 021BD2CA-51D2-11E3-8E56-B75417C70B44,UsbDeviceProtocolGuid
 022218B8-FE5E-4EBC-BC96-74058A4E7E83,ErrorGlobeBorder
-02337E07-2CF2-46BE-BCF7-834945FCCEB9,gEfiUnbootablePartitionGuid
+02337E07-2CF2-46BE-BCF7-834945FCCEB9,EfiUnbootablePartitionGuid
 024DEE41-33E7-11D3-9D69-0008C781F39F,EfiPartTypeLegacyMbrGuid
 025BBFC7-E6A9-4B8B-82AD-6815A1AEAF4A,MnpDxe
 025F738B-4EBD-4D55-B728-5F421B601F1F,PlatformInfoDxe
 025F738B-4EBD-4D55-B728-5F421B601F20,PlatformCpuInfoDxe
 0284F846-2CB7-4960-8DB2-47AA71513AD5,menu_selection
-02AC0805-155F-473A-A302-0D89D6E1E6CC,GUID_DRVR_AsusSLP2
+02AC0805-155F-473A-A302-0D89D6E1E6CC,AsusSLP2
 02B01AD5-7E59-43E8-A6D8-238180613A5A,EmuVariableRuntimeDxe
 02BD55C2-AB1D-4B75-B0FD-9A63AE09B31D,BaseMemoryLibOptDxe
 02CE967A-DD7E-4FFC-9EE7-810CF0470880,EfiEndOfDxeEventGroupGuid
 02E800BE-8F01-4AA6-946B-D71388E1833F,EFI_MTFTP4_SERVICE_BINDING_PROTOCOL_GUID
 02EEA107-98DB-400E-9830-460A1542D799,Ip6ConfigNvDataGuid
 02F04694-2C0A-4F1E-B0CE-64BE25890B03,DebugAgentTimerLibNull
-0325A554-05BE-466B-BC8C-70BE3C9DAFB1,gAmiTcg2InfoProtocolGuid
+0325A554-05BE-466B-BC8C-70BE3C9DAFB1,AmiTcg2InfoProtocolGuid
 0325B5A1-0937-4A4F-B8AF-EC3F80EE6B35,SataControllerDxe
 03583FF6-CB36-4940-947E-B9B39F4AFAF7,EfiSmbiosProtocolGuid
 036F84E1-7F37-428C-A79E-575FDFAA84EC,EfiIommuDMArErrorSectionGuid
 0379BE4E-D706-437D-B037-EDB82FB772A4,EfiDevicePathUtilitiesProtocolGuid
 0397B0C9-22E8-459E-A4FF-99BC65270929,Tpm2StartupLocalityHobGuid
 03AF477A-8336-0142-8A65-B4BD93B1A1A9,FirmwareExtension
-03C1F5C8-48F1-416E-A6B6-992DF3BBACA6,file_A01SmmServiceBody
+03C1F5C8-48F1-416E-A6B6-992DF3BBACA6,A01SmmServiceBody
 03C4E603-AC28-11D3-9A2D-0090273FC14D,EfiPxeBaseCodeProtocolGuid
 03C70B0D-67E6-5C16-8E57-312DF246A961,BootChimeAudio
 03DA99B3-DDF4-4C7E-8CCA-216FC3F1F311,BaseFspSecPlatformLibNull
@@ -62,7 +62,7 @@
 0419F582-0625-4531-8A33-85A9965C95BC,WinNtBusDriverGuid
 041FD986-B016-47CE-AFC5-2269EDD4AD64,ACPIS4Dxe
 044310AB-77FD-402A-AF1A-87D4120E7329,FirmwarePerformanceSmm
-045B6F49-9102-4590-A0A5-35311B0AEFC3,gEfiDpsdRSA1024AndSHA256SignatureVerificationProtocolGuid
+045B6F49-9102-4590-A0A5-35311B0AEFC3,EfiDpsdRSA1024AndSHA256SignatureVerificationProtocolGuid
 0468A601-C535-46FD-A95D-BBAB991B178C,EfiPowerOnHobGuid
 046C44DB-59DF-41B3-AF53-EF707B930E9A,FtRecovery
 04877BE8-FAC0-448E-801D-F0F895CCB012,SmbiosDmiEditSsi
@@ -70,23 +70,23 @@
 04B37FE8-F6AE-480B-BDD5-37D98C5E89AA,EdkiiVarErrorFlagGuid
 04EAAAA1-29A1-11D7-8838-00500473D4EB,USBRT
 04F75442-A593-4281-BD4B-095935B7D2F8,wifi_1bar
-05041A6B-4DEE-47BB-9E58-5944D1870EE5,gUsbConfigGuid
+05041A6B-4DEE-47BB-9E58-5944D1870EE5,UsbConfigGuid
 050EB8C6-C12E-4B86-892B-40985E8B3137,UefiDevicePathLibDevicePathProtocol
 0515BC05-2959-4E91-89C6-6B3A3F1FCB65,TCG_MPDriver
 0541150C-E33B-4DAF-A263-02E4BB4BF1CF,SecurityErrorHandlingDxe
 054F2504-E2BC-4641-83FC-502588FE1F28,CpuInitDxe
 0565365C-2FE1-4F88-B3BE-624C04623A20,MicrocodeUpdateDxe
-05687F4A-3CA7-4D19-9BC5-E180CEA3569F,gAmiPlatformSecurityChipGuid
+05687F4A-3CA7-4D19-9BC5-E180CEA3569F,AmiPlatformSecurityChipGuid
 056BCA18-2F19-41EE-84EA-83746CB5069A,CrystalRidgeSMM
 056E7324-A718-465B-9A84-228F06642B4F,PlatformDxe
 057A449A-1FDC-4C06-BFC9-F53F6A99BB92,EfiPciCfg2PpiGuid
-0583D694-AF8B-4BAA-9583-813CEDF40843,file_CsmInt10Block
+0583D694-AF8B-4BAA-9583-813CEDF40843,CsmInt10Block
 0584FC67-72B9-4D46-AE3E-AD330452D9B4,InputDeviceAggregatorDxe
 05984E1A-D8BB-5D8A-A8E6-90E6FB2AB7DA,AlertUI
 05AD34BA-6F02-4214-952E-4DA0398E2BB9,EfiDxeServicesTableGuid
 05C99A21-C70F-4AD2-8A5F-35DF3343F51E,EfiDevicePathFromTextProtocolGuid
 05DFCA46-141F-11DF-8508-E38C0891C4E2,HfsPlusDxe
-05F7AA70-A64A-432C-8CEE-4CDECB8671D7,file_A01ODMDxeDriver
+05F7AA70-A64A-432C-8CEE-4CDECB8671D7,A01ODMDxeDriver
 05FFB44D-EE01-40E1-9866-FD27FD4FBE92,ThunderboltDeviceDxe
 060CC026-4C0D-4DDA-8F41-595FEF00A502,MemoryStatusCodeRecordGuid
 0619F5C2-4858-4CAA-A86A-73A21A18DF6B,GenericWatchdogDxe
@@ -99,7 +99,7 @@
 0718AD81-F26A-4850-A6EC-F268E309D707,Tpm20PlatformDxe
 071A3DBE-CFF4-4B73-83F0-598C13DCFDD5,Slp21Markers
 073E2576-F6C1-4B91-92A9-D4675DDA34B1,PttPassThruProtocolGuid
-073E7E01-2611-4E85-B896-A3B6767CBA00,gAmiTsePasswordPromptEnterGuid
+073E7E01-2611-4E85-B896-A3B6767CBA00,AmiTsePasswordPromptEnterGuid
 074993A4-19A1-4E0D-B892-8FBCC6D79F35,SaveMemoryConfig
 074E1E48-8132-47A1-8C2C-3F14AD9A66DC,EfiGlobalNvsAreaProtocolGuid
 07525079-2616-4599-93FA-5EE9E3F0295C,CsmPolicy
@@ -127,25 +127,25 @@
 08EFD15D-EC55-4023-B648-7BA40DF7D05D,PeiRamBoot
 08F2C63B-08DE-4CCD-8670-ACFE644A1C48,PchS3Support
 08F74BAA-EA36-41D9-9521-21A70F8780BC,EfiDiskInfoScsiInterfaceGuid
-0903DD14-2CA0-458A-B5EB-0C0CA30D785C,gAmiSmbiosBoardProtocolGuid
+0903DD14-2CA0-458A-B5EB-0C0CA30D785C,AmiSmbiosBoardProtocolGuid
 0922E604-F5EC-42EF-980D-A35E9A2B1844,IpSecConfig
 093E0FAE-A6C4-4F50-9F1B-D41E2B89C19A,EfiCertSha512Guid
 09576E91-6D3F-11D2-8E39-00A0C969723B,EfiDevicePathProtocolGuid
 09576E92-6D3F-11D2-8E39-00A0C969723B,EfiFileInfoGuid
 09576E93-6D3F-11D2-8E39-00A0C969723B,EfiFileSystemInfoGuid
-09767DB6-412A-45BA-8026-F087CAE210E3,file_DTSPolicy
+09767DB6-412A-45BA-8026-F087CAE210E3,DTSPolicy
 09831032-6FA3-4484-AF4F-0A000A8D3A82,PL180MciDxe
 09D13410-2718-463A-8B15-DA93C3CA0A64,UsbCdcEcm
-09D445BE-3C89-4E4F-ABE0-51FA84C2E4FF,gScGeneralConfigGuid
-09D5B53F-F4B0-4F59-A0B1-7B57D35C0E05,gNicIp4ConfigNvDataGuid
+09D445BE-3C89-4E4F-ABE0-51FA84C2E4FF,ScGeneralConfigGuid
+09D5B53F-F4B0-4F59-A0B1-7B57D35C0E05,NicIp4ConfigNvDataGuid
 09EA8911-BE0D-4230-A003-EDC693B48E11,VlvPeiInitPpiGuid
 09EA894A-BE0D-4230-A003-EDC693B48E95,PchInitPpiGuid
 0A1D4FD8-4704-4501-85EB-93399492CBED,DevShell
 0A2FBD15-1C25-407E-8915-60C5652BC2AA,SystemFirmwareUpdateDxe
-0A4D622D-01F4-4974-B3F5-2BFE9888EF92,gSLP20OEMPublicKeyVariableGuid
+0A4D622D-01F4-4974-B3F5-2BFE9888EF92,SLP20OEMPublicKeyVariableGuid
 0A5EA2E1-BE0B-44A0-A775-F429C9A018A0,PlatformEarlyInit
-0A602C5B-05A0-40C4-9181-EDCD891D0001,GUID_DRVR_OememDxeCore
-0A602C5B-05A0-40C4-9181-EDCD891D0003,GUID_PEIM_OememPeiCore
+0A602C5B-05A0-40C4-9181-EDCD891D0001,OememDxeCore
+0A602C5B-05A0-40C4-9181-EDCD891D0003,OememPeiCore
 0A66E322-3740-4CCE-AD62-BD172CECCA35,ScsiDisk
 0A845224-8675-4241-8AE9-4D94C93DEB90,PauseKey
 0A8BADD5-03B8-4D19-B128-7B8F0EDAA596,EfiConfigKeywordHandlerProtocolGuid
@@ -154,7 +154,7 @@
 0AC12AB3-DD33-4460-87F5-82694D3D7402,SmcOFBDNull
 0AC2D35D-1C77-1033-A6F8-7CA55DF7D0AA,CpuPolicyPei
 0AD3D31B-B3D8-4506-AE71-2EF11006D90F,UefiAcpiBoardInfoGuid
-0ADFB62D-FF74-484C-8944-F85C4BEA87A8,gAmiEfiKeycodeProtocolGuid
+0ADFB62D-FF74-484C-8944-F85C4BEA87A8,AmiEfiKeycodeProtocolGuid
 0AE8CE5D-E448-4437-A8D7-EBF5F194F731,EfiDxeIplPpiGuid
 0AF0B742-63EC-45BD-8DB6-71AD7F2FE8E8,ShellDriver1HiiGuid
 0AF7C79C-65B5-4319-B0AE-44EC484E4AD7,EfiHashAlgorithmMD5Guid
@@ -165,10 +165,10 @@
 0B64AAB0-5429-11D4-9816-00A0C91FADCF,EfiBisProtocolGuid
 0B6E5233-A65C-44C9-9407-D9AB83BFC8BD,EfiCertSha224Guid
 0B6F5CA7-4F53-445A-B76E-2E365B806366,ArmVirtTokenSpaceGuid
-0B7E694D-B909-4097-9C03-5E728489F709,gHybridGraphicsConfigGuid
-0BA8263C-A8BD-4AAD-B402-6A6AF2F7E77D,gBlockDeviceCapsuleGuid
+0B7E694D-B909-4097-9C03-5E728489F709,HybridGraphicsConfigGuid
+0BA8263C-A8BD-4AAD-B402-6A6AF2F7E77D,BlockDeviceCapsuleGuid
 0BB51CDD-A750-442F-A15E-7DEADFBA30FF,Mtftp4Dxe2
-0BBC6CAB-F228-4F20-8C6A-847CDEE3FF24,file_OFCDxeDriver
+0BBC6CAB-F228-4F20-8C6A-847CDEE3FF24,OFCDxeDriver
 0BCB2808-FEA5-6047-9A60-8767A46A72A1,AppleUdp4Dxe
 0BF70067-D53B-42DF-B770-E92C91C61411,EfiTdtProtocolGuid
 0C0F3B43-44DE-4907-B478-225F6F6289DC,UsbKeyboardLayoutPackageGuid
@@ -179,7 +179,7 @@
 0C3B7B59-28E5-4C99-85E5-D0116DBFAAF2,IsctWakeReason
 0C5FCE90-1C03-4ED2-9EFE-B1D02E72B3B0,menu_bottom_mid
 0C85DF8A-4212-4CC1-A4AA-1A7A36E8DA97,FpgaPlatformEarlyInit
-0C88B3B5-6A1D-4657-AA88-1B7D92FF3699,file_CMFCSwSmi
+0C88B3B5-6A1D-4657-AA88-1B7D92FF3699,CMFCSwSmi
 0C95A916-A006-11D4-BCFA-0080C73C8881,WinNtThunkDxe
 0C95A928-A006-11D4-BCFA-0080C73C8881,EfiWinNtVirtualDisksGuid
 0C95A92F-A006-11D4-BCFA-0080C73C8881,EfiWinNtPhysicalDisksGuid
@@ -224,8 +224,8 @@
 0EFC6282-F1E5-469A-8A70-194A8761F9AA,XenAcpiPlatformDxe
 0F0B1735-87A0-4193-B266-538C38AF48CE,EfiIfrTianoGuid
 0F17CECC-653A-C343-9CFA-FAA27A07EFE5,AppleCrypto
-0F500BE6-ECE4-4ED8-9081-9AA9A523FB7B,gHstiPublishCompleteProtocolGuid
-0F5EF786-17A0-40C6-BC18-1B3272A00987,file_IccInit
+0F500BE6-ECE4-4ED8-9081-9AA9A523FB7B,HstiPublishCompleteProtocolGuid
+0F5EF786-17A0-40C6-BC18-1B3272A00987,IccInit
 0F6499B1-E9AD-493D-B9C2-2F90815C6CBC,EfiPhysicalPresenceGuid
 0F69F6D7-0E4B-43A6-BFC2-6871694369B0,WdtAppPei
 0F729F33-25C1-41A7-86B2-23A737A91823,IntelSnbGopVbt
@@ -236,7 +236,7 @@
 0FAAECB1-226E-4782-AACE-7DB9BCBF4DAF,EfiFtp4ServiceBindingProtocolGuid
 0FAD5644-7BDF-4A75-B568-287AE2EBD3A6,SmcSwSmiFlashSmm
 0FB7C852-ADCA-4853-8D0F-FBA71B1CE11A,EfiFormBrowserCompatibilityProtocolGuid
-0FC50878-1633-432A-BDE4-841357FC15E9,gAmiScsiPassThruInitProtocolGuid
+0FC50878-1633-432A-BDE4-841357FC15E9,AmiScsiPassThruInitProtocolGuid
 0FC9013A-0568-4BA9-9B7E-C9C390A6609B,EfiLegacyRegionProtocolGuid
 0FD96974-23AA-4CDC-B9CB-98D17750322A,EfiHiiStringProtocolGuid
 0FDB764B-E669-4C69-83AC-5EDD99A2711E,ReadOnlyVariableOnReadOnlyVariable2Thunk
@@ -244,7 +244,7 @@
 0FFBCE19-324C-4690-A009-98C6AE2EB186,RecoveryOnFatUsbDiskGuid
 100C2CFA-B586-4198-9B4C-1683D195B1DA,MMC
 1015EA63-7421-417D-BB51-E5193061C551,DxeIpmiUsb
-10164673-D365-4BE2-8513-1497CC07611D,gScPolicyPpiGuid
+10164673-D365-4BE2-8513-1497CC07611D,ScPolicyPpiGuid
 102287B4-6B12-4D41-91E1-EBEE1F3AA614,UefiDebugLibDebugPortProtocol
 1051EC65-F6FC-41EA-BA51-344C37F60CDF,BoardConfigInitPreMem
 105FF0EA-A0C0-48A8-B8F7-E8B4D62A1019,FmpAuthenticationLibRsa2048Sha256
@@ -258,15 +258,15 @@
 10BA6BBE-A97E-41C3-9A07-607AD9BD60E5,EfiVlv2VariableGuid
 10C22623-DB6F-4721-AA30-4C12AF4230A7,IdeRecovery
 10C22623-DB6F-4721-AA30-9C12AF4230F8,ExtRecovery
-10DB0A54-F6F9-4CA2-A75E-F9AACAE70970,gBiosGuardConfigGuid
+10DB0A54-F6F9-4CA2-A75E-F9AACAE70970,BiosGuardConfigGuid
 10E26DF1-8775-4EE1-B50A-3AE82893703A,SeCfTPMPpiGuid
 10EE5462-B207-4A4F-ABD8-CB522ECAA3A4,Udp4Dxe
 10EE54AE-B207-4A4F-ABD8-CB522ECAA3A4,Udp6Dxe
-11354A0C-781E-44A1-A787-C0178C8D570F,gP2sbConfigGuid
+11354A0C-781E-44A1-A787-C0178C8D570F,P2sbConfigGuid
 113B2126-FC8A-11E3-BD6C-B8E8562CBAFA,EfiBootManagerPolicyConnectAllGuid
-113FD31A-BE8B-418B-B034-7EAFE5C60C99,gEsaInterfacesForTseProtocolGuid
+113FD31A-BE8B-418B-B034-7EAFE5C60C99,EsaInterfacesForTseProtocolGuid
 114B7105-6CC9-453C-BADC-16DF227BB4EF,TrEESmm
-114BA15A-6189-180D-BFC0-2053B3480949,gEfiBoardSelectGuid
+114BA15A-6189-180D-BFC0-2053B3480949,EfiBoardSelectGuid
 114DA5EF-2CF1-4E12-9BBB-C470B55205D9,EfiAdapterInfoSanMacAddressGuid
 11527125-78B2-4D3E-A0DF-41E75C221F5A,CpuS3
 1156EFC6-EA32-4396-B5D5-26932E83C313,EfiSpiProtocolGuid
@@ -279,9 +279,9 @@
 11D8AC35-FB8A-44D1-8D09-0B5606D321B9,DSDT
 11D92DFB-3CA9-4F93-BA2E-4780ED3E03B5,VirtioBlkDxe
 11FBFDFB-10D2-43E6-B5B1-B4386EDCCB9A,EfiSeCRcInfoProtocolGuid
-12025686-3984-466C-980B-8B5E89DA0319,gAmiReadyToLoadDxeCorePpiGuid
+12025686-3984-466C-980B-8B5E89DA0319,AmiReadyToLoadDxeCorePpiGuid
 1206F7CA-A475-4624-A83E-E6FC9BB38E49,SmmControl2Dxe
-120D28AA-6630-46F0-8157-C0ADC2383BF5,gAmiLegacyBootProtocolGuid
+120D28AA-6630-46F0-8157-C0ADC2383BF5,AmiLegacyBootProtocolGuid
 1216BD2A-C05E-4C6D-91E7-EB8E37AD3B7A,aDefaultDXE
 12345678-930A-4A95-AB04-2E6CFDFF6631,TcgPeiAftermem
 1259F60D-B754-468E-A789-4DB85D55E87E,EfiSwapAddressRangeProtocolGuid
@@ -290,10 +290,10 @@
 127C1C4E-9135-46E3-B006-F9808B0559A5,Slp20Markers
 128FB770-5E79-4176-9E51-9BB268A17DD1,PciHostBridgeDxe
 129F6AA7-AB69-4CB8-AED1-40985001115E,SerialMuxControl
-12AEDBEA-392D-4E2A-8789-5F6DC6B23661,OemBadgingSupportDxe
+12AEDBEA-392D-4E2A-8789-5F6DC6B23661,OemBadginSupportDxe
 12BFCA88-7A2F-4AB5-9A5D-C40CA68BF75F,BootOrderSection
 12C67BE1-AD2E-4F13-A95F-6EDC2C4392DE,MePolicyInitPei
-12CADD30-6007-4C83-89D7-FF237F7B947A,gSetupCompleteRedrawGuid
+12CADD30-6007-4C83-89D7-FF237F7B947A,SetupCompleteRedrawGuid
 12D1D3A2-99F7-420B-BC69-8BB1D492A355,Logoid
 12E2306C-1EBD-3140-B92E-EFA9099E82D2,CacheManager
 12F38E73-B34D-4559-99E5-AE2DCD002156,BaseFspWrapperPlatformLibSample
@@ -307,7 +307,7 @@
 132EC73B-3025-4FBF-B193-8ACB50EFBD89,QFlash
 132EC73B-BD26-4FBF-B193-8ACB50EFBD89,UserDefSetupDxe
 1353DE63-B74A-4BEF-80FD-2C5CFA83040B,GifDecoderDxe
-135902E7-9709-4B41-8FD2-4069DAF0546A,gTcgEfiGlobalVariableGuid
+135902E7-9709-4B41-8FD2-4069DAF0546A,TcEfiGlobalVariableGuid
 136A3048-752A-4BF6-A757-0936119538ED,UiStringPackGuid
 137B3044-F6D7-473E-A625-9FB92505C180,EfiSpiBusProtocolGuid
 1388066E-3A57-4EFA-98F3-C12F3A958A29,EfiPeiSecurityPpiGuid
@@ -318,7 +318,7 @@
 13B00AAE-4FD2-964E-B30F-94627017370A,BmpConvert
 13C5506E-8231-415E-9EBC-88DD115E3818,SmbiosElog
 13ECD928-87AB-4460-BBE0-B520F9EB1D32,IconNetBoot
-13F40F6E-50C1-4B73-B1E2-6E72D21CB04A,gEfiUsbLegacyPlatformProtocolGuid
+13F40F6E-50C1-4B73-B1E2-6E72D21CB04A,EfiUsbLegacyPlatformProtocolGuid
 13F4EA8E-BFF1-43BF-8F44-80BCC96040F1,FpgaDxe
 13FA7698-C831-49C7-87EA-8F43FCC25196,EfiEventVirtualAddressChangeGuid
 1400F9E6-4BAB-4B68-A53F-58FD240818E6,Reset_Modify
@@ -342,7 +342,7 @@
 14FF38A8-ACBA-4228-A7D7-A73260C7559B,PiSmmStatusCodeOnFrameworkSmmStatusCodeThunk
 151C8EAE-7F2C-472C-9E54-9828194F6A88,EfiDiskIo2ProtocolGuid
 15344673-D365-4BE2-8513-1497CC07611D,PchPlatformPolicyPpiGuid
-154774EC-4350-40D4-AF66-7D1837BCD559,gEfiHeciTrustedChannelSmmProtocolGuid
+154774EC-4350-40D4-AF66-7D1837BCD559,EfiHeciTrustedChannelSmmProtocolGuid
 1547B4F3-3E8A-4FEF-81C8-328ED647AB1A,Csm16
 154CAB4A-52B5-46CD-99C3-4368ABBACFFD,MetronomeDxe
 1551A247-BB31-4393-8BB4-10509AE2F18F,ChargeLedDebugPei
@@ -353,9 +353,9 @@
 158DEF5A-F656-419C-B027-7A3192C079D2,ShellVariableGuid
 15B985C5-7103-4F35-B59D-2235FC5F3FFE,UsbTypeC
 15B9B6DA-00A9-4DE7-B8E8-ED7AFB88F16E,CpuPolicyInitDxe
-15C5E761-58D8-461A-9173-CAB020916264,VgaMiniPort
+15C5E761-58D8-461A-9173-CAB020916264,VAminiPort
 15CCACBE-2A4A-45ED-9EC2-53135F98AB24,BmcAcpi
-15CF24A9-F9AB-46D0-8DCF-83664C632FD8,GUID_PEIM_MemDetect
+15CF24A9-F9AB-46D0-8DCF-83664C632FD8,MemDetect
 15FE2940-B426-479A-A002-5454A34C7A6E,FlashMapBin
 1601E050-BE0C-41B7-8F96-9F48F72B7E26,OnboardControllerCtrl
 16036A73-E8EF-46D0-953C-9B8E96527D13,Reset
@@ -370,7 +370,7 @@
 16A4ADD0-EF11-4C86-B159-88A2A8C4501C,wifi_3bars
 16AD4FE0-B5B1-11DF-8CBF-0002A5D5C51B,PL310L2Cache
 16B45DA2-7D70-4AEA-A58D-760E9ECB841D,FD_Drv_X86
-16B6109E-194C-440F-94F8-C7CCCCC32DEB,gEfiCseEndofPostProtocolGuid
+16B6109E-194C-440F-94F8-C7CCCCC32DEB,EfiCseEndofPostProtocolGuid
 16C58600-554B-4587-8C62-A40997CFE206,ASRockNetSmtpBin
 16C8A6D0-FE8A-4082-A208-CF89C4290433,UefiSystemTableInfoGuid
 16D0A23E-C09C-407D-A14A-AD058FDD0CA1,ACPI
@@ -381,11 +381,11 @@
 171F43DC-C4D9-47A6-9641-65DDCDD5AA30,UsbRtDxe
 174CF46D-B167-4E6A-B1CD-D41E24EFA0F9,ASUSBackupSmm
 17689034-F11B-468B-8CC4-E114C77F41B1,AsusPTTDxe
-17706D27-83FE-4770-875F-4CEF4CB8F63D,gAmiAhciPlatformPolicyProtocolGuid
+17706D27-83FE-4770-875F-4CEF4CB8F63D,AmiAhciPlatformPolicyProtocolGuid
 17772369-D262-4B90-9F31-BDC41F2663A5,mebx_main
 177B2C74-9674-45F4-AAEB-43F5506AE0FE,ASUSPOSTMessage
-177D39D2-43B8-40C8-9AE1-3C5198D6941E,gPeiTcgPpiGuid
-177E63C1-AED6-4D88-917E-9B4FB9FE4092,gPhoenixSmmCoreServicesProtocolGuid
+177D39D2-43B8-40C8-9AE1-3C5198D6941E,PeiTcgPpiGuid
+177E63C1-AED6-4D88-917E-9B4FB9FE4092,PhoenixSmmCoreServicesProtocolGuid
 17851FBF-45C4-4FF7-A2A0-C3B12D63C27E,SdBlockIoPei
 17985E6F-E778-4D94-AEFA-C5DD2B77E186,QemuFwCfgAcpiPlatform
 17A0A3D7-C0A5-4635-BBD5-072187DFE2EE,EmbeddedGpioProtocolGuid
@@ -396,18 +396,18 @@
 1810AB4A-2314-4DF6-81EB-67C6EC058591,BootScriptTableBaseGuid
 1830A6DD-E03D-4BC0-B115-94D91950FE4A,SioDynamicSetup
 18435CD7-8003-4CED-AFA4-ECBC440C0F30,FwBlockServiceDxe
-18633BFC-1735-4217-8AC9-17239282D3F8,gEfiBttAbstractionGuid
+18633BFC-1735-4217-8AC9-17239282D3F8,EfiBttAbstractionGuid
 18A031AB-B443-4D1A-A5C0-0C09261E9F71,EfiDriverBindingProtocolGuid
 18A3C6DC-5EEA-48C8-A1C1-B53389F98999,EfiSmmSwDispatch2ProtocolGuid
 18EF8946-68F5-49E6-B202-CE90C3EEF1C9,IchSmmDispatcherDxe
-1967DD9B-B72C-4328-8C80-D4ACFC83FDF8,file_PciHotPlug
+1967DD9B-B72C-4328-8C80-D4ACFC83FDF8,PciHotPlug
 196CA3D8-9A5A-4735-B328-8FFC1D93D188,TcgPlatformSetupPolicy
 197DB236-F856-4924-90F8-CDF12FB875F3,Microcode
 1988A1D8-04FC-4D68-B58D-636F36F30D82,SoftStrapsPeim
 199C1EF0-6400-41C5-B0A4-FFBF219DCBAE,QuarkPlatformTokenSpaceGuid
 199FD111-0785-4132-A9B3-1F66573F0060,GenericComponentsSmm
 19A84692-4AAD-C04B-90E9-E017360A9860,DiskImage
-19AD5244-FD6B-4E5C-826A-414646D6DA6A,gEfiGlkVariableGuid
+19AD5244-FD6B-4E5C-826A-414646D6DA6A,EfiGlkVariableGuid
 19CB87AB-2CB9-4665-8360-DDCF6054F79D,EfiPciHotPlugRequestProtocolGuid
 19D17940-BA8D-4FA7-A704-F33D9FAFAB9D,LibStringlist
 19DBBDC1-DEDF-4DED-8684-2476B99FAC91,AST2500DxeInit
@@ -426,19 +426,18 @@
 1A8E9D96-66E6-461B-95D6-882C984D0B00,TbtPei
 1A931FB8-C466-454A-B684-73ADA2CB050B,ASUSPOSTMessagePEI
 1AA6D900-89D1-4C21-9C50-EDC7390A67C3,SlotDataUpdateDxeNeonCityFPGA
-1ACED566-76ED-4218-BC81-767F1F977A89,1
-1B05DE41-C93B-4BB4-AD47-2A78AC0FC9E4,gHstiProtocolGuid
+1B05DE41-C93B-4BB4-AD47-2A78AC0FC9E4,HstiProtocolGuid
 1B0FB9BF-699D-4FDD-A7C3-2546681BF63B,EfiWiFi2ProtocolGuid
 1B1183FA-1823-46A7-8872-9C578755409D,EfiSmmPowerButtonDispatch2ProtocolGuid
-1B1924C3-6321-484F-83EF-8894B21DE258,gAmiPeiCrbInfoPpiGuid
+1B1924C3-6321-484F-83EF-8894B21DE258,AmiPeiCrbInfoPpiGuid
 1B2C4952-D778-4B64-BDA1-15A36F5FA545,Slp20PubKey
 1B45CC0A-156A-428A-AF62-49864DA0E6E6,AprioriPei
 1B59CCDA-7DB2-4A55-AFC2-4364F824D288,McBankErrorInjection
-1B5C27FE-F01C-4FBC-AEAE-341B2E992A17,gFspSFirmwareFileSystemFvGuid
-1B6BC809-C986-4937-934F-1EA58622FE50,gAmiTseBootOrderChangeGuid
+1B5C27FE-F01C-4FBC-AEAE-341B2E992A17,FspSFirmwareFileSystemFvGuid
+1B6BC809-C986-4937-934F-1EA58622FE50,AmiTseBootOrderChangeGuid
 1B6E9D50-12E4-4B55-81D9-1ABFEC59D4FC,WakeupCtrlSmm
 1BA0062E-C779-4582-8566-336AE8F78F09,Volume Top File
-1BB13967-8B24-411B-9828-18D285A9CC4D,gAmiPpiGuid
+1BB13967-8B24-411B-9828-18D285A9CC4D,AmiPpiGuid
 1BB737EF-427A-4144-8B3B-B76EF38515E6,SdMmcPciHcPei
 1BE65202-9318-492D-A551-08DF2BD60AEE,AmtPlatformPolicy
 1BF06AEA-5BEC-4A8D-9576-749B09562D30,ProcessorProducerGuid
@@ -449,7 +448,7 @@
 1C6B2FAF-D8BD-44D1-A91E-7321B4C2F3D1,ScriptSaveDxe
 1C8B7F78-1699-40E6-AF33-9B995D16B043,PiSmmCommunicationPei
 1C98780A-C67D-4D9B-A9D8-4AC0487A6D6E,PcdRecoveryPei
-1CBFC9B6-7F1E-4E9E-801F-FBCE4D92A76D,gAmiTseBeforeTimeOutGuid
+1CBFC9B6-7F1E-4E9E-801F-FBCE4D92A76D,AmiTseBeforeTimeOutGuid
 1CE12314-AFBC-11F0-8A3E-AB44B8EE3120,PpmPolicyInitDxe
 1CF3F8B3-C5B1-49A2-AA59-5EEF92FFA63C,EfiIa32X64ErrorTypeBusCheckGuid
 1CF40D19-EEAD-4C73-93DB-BBB8B6ACF929,UserIdentificationDxe
@@ -461,7 +460,7 @@
 1D3E9CB8-43AF-490B-830A-3516AA532047,EdkiiFaultTolerantWriteGuid
 1D57B5D5-BAB4-4D2B-B7EB-0EB41D7B189C,LibGlob
 1D6F730F-5A55-4078-869B-E0A18324BDC8,TemplateSec
-1D6F853E-0006-40D8-9B4B-79618A5733B0,gAmiTseOemPortingVar3Guid
+1D6F853E-0006-40D8-9B4B-79618A5733B0,AmiTseOemPortingVar3Guid
 1D85CD7F-F43D-11D2-9A0C-0090273FC14D,EfiUnicodeCollationProtocolGuid
 1D88C542-9DF7-424A-AA90-02B61F286938,WdtPei
 1DA353A3-6400-4241-9AB0-E3E65C690EF7,IchSmbusArpDisabled
@@ -474,19 +473,19 @@
 1DDBFD6A-3423-462F-9150-A7FFA66FF0CA,StaticSkuDataDxeLightningRidgeEXRP
 1DE0B8C2-FFB6-4BDF-97F5-0FFB33979038,BaseReportStatusCodeLibNull
 1DF18DA0-A18B-11DF-8C3A-0002A5D5C51B,SataSiI3132
-1DFB7BFA-BF8E-4D11-9766-2FB0D0442310,GUID_DRVR_AmiAgesaDxe
+1DFB7BFA-BF8E-4D11-9766-2FB0D0442310,AmiAgesaDxe
 1DFFE9F3-7B5F-4B44-8EBD-39A739EBA903,AcpiPlatform
 1E2ACC41-E26A-483D-AFC7-A056C34E087B,EfiPlatformInfoGuid
-1E2ACC41-E26A-483D-AFC7-A056C34E087C,gEfiNorthPeakGuid
+1E2ACC41-E26A-483D-AFC7-A056C34E087C,EfiNorthPeakGuid
 1E2ED096-30E2-4254-BD89-863BBEF82325,EfiTcg2FinalEventsTableGuid
-1E30E33D-1854-437A-BD68-FC1553AA8BE4,gCseEmmcSelectPpiGuid
+1E30E33D-1854-437A-BD68-FC1553AA8BE4,CseEmmcSelectPpiGuid
 1E43298F-3478-41A7-B577-86064635C728,OptionRomPkgTokenSpaceGuid
-1E469095-EFC8-4147-97DB-4D68B727E2E0,file_FwBlockService
+1E469095-EFC8-4147-97DB-4D68B727E2E0,FwBlockService
 1E4EAAB1-E637-443E-A5D6-56E60D97C619,UsbComboPeimPei
 1E5668E2-8481-11D4-BCF1-0080C73C8881,EfiVariableArchProtocolGuid
-1E753E16-DCEF-47D0-9A38-7ADECDB983ED,gTcmLegX16FileGuid
+1E753E16-DCEF-47D0-9A38-7ADECDB983ED,TcmLegX16FileGuid
 1E75E77F-8A15-4653-964D-542C157EF40A,SgPeiPolicyInit
-1E77550E-E429-4FA9-BEBF-B515ACF7D919,file_Ip6
+1E77550E-E429-4FA9-BEBF-B515ACF7D919,Ip6
 1E82B556-4EB6-479F-955A-78A5FE0C0CB2,BroadcomWirelessDxe
 1E843AD6-E237-42FC-BDA2-DE78542E16DD,SstSpiFlash
 1E93E633-D65A-459E-AB84-93D9EC266D18,EfiTapeIoProtocolGuid
@@ -503,7 +502,7 @@
 1F36527E-A97C-45F8-B24A-9D95B0A940FE,AppleBrightnessControl
 1F3CDFBE-F7AE-4453-8C48-C1AD35A4FD98,SmbiosDmiEditProtocol
 1F4C6F90-B06B-48D8-A201-BAE5F1CD7D56,EfiPeiStallPpiGuid
-1F642910-3D7B-4627-8D18-DC62671E0554,gBiosReservedMemoryPolicyPpiGuid
+1F642910-3D7B-4627-8D18-DC62671E0554,BiosReservedMemoryPolicyPpiGuid
 1F73B18D-4630-43C1-A1DE-6F80855D7DA4,EfiFormBrowserExProtocolGuid
 1F77FFD9-C00D-4245-B2AC-F5F43E333C39,PtuLoader
 1F78349D-7FBA-4686-8098-FA017EDA35FB,ArmShellCmdRunAxf
@@ -515,13 +514,13 @@
 202A2922-8C27-4943-9855-26180BF9F113,VariableInfo
 202A2B0E-9A31-4812-B291-8747DF152439,Ps2MouseDxe
 204810E0-4941-4C66-B99A-6BEE4F84453C,AtherosWiFi
-204C3D37-D83F-49AB-883F-9B5D6C647762,gFspTempRamExitGuid
+204C3D37-D83F-49AB-883F-9B5D6C647762,FspTempRamExitGuid
 20605BBA-7FB9-4279-959F-8DBF74CDB0C6,VideoBios
 208117F2-25F8-479D-B726-10C10BED6DC1,AppleLegacyRegion
 20830080-CC28-4169-9836-7F42B8D0C8C9,GraphicsOutputDxe
 20B181E2-33E8-4211-B9D7-9B8696764E66,WheaElog
 20D8FFFE-15C3-4EA9-9D28-CFE2745D78F3,CryptoDxe
-20DAF0FC-5548-44DC-A42A-60EAF0A22E47,gDxePlatformTdtPolicyGuid
+20DAF0FC-5548-44DC-A42A-60EAF0A22E47,DxePlatformTdtPolicyGuid
 21094ECB-9F20-4781-AE4B-50728B389A6E,IchInit
 210DCB72-BC14-4A19-A29B-F696EB7DE12B,EzSetup
 2119BBD7-9432-4F47-B5E2-5C4EA31B6BDC,DxeIpl
@@ -535,7 +534,7 @@
 21AF95E1-371F-4712-9C07-798E3CB019E4,LockSMRAMEntryDxe
 21CCF0B7-246B-412C-A334-0B65A07B28DF,SmmBaseOnSmmBase2Thunk
 21E34727-3881-4DEE-8020-D8908A980311,EpuHwModeDxe
-21E70404-DF72-4122-B030-281306EB7BE3,gVbtEdpTypeCGuid
+21E70404-DF72-4122-B030-281306EB7BE3,VbtEdpTypeCGuid
 21F302AD-6E94-471B-84BC-B14800403A1D,EfiSmmCpuSaveStateProtocolGuid
 21FF1FEE-D33A-4FCE-A65E-955EA3C41F40,QNCMemoryInitPpiGuid
 22046D50-F390-498C-92E5-5BA4F8E7F8B6,SBSATAIDE
@@ -555,23 +554,23 @@
 233C2592-1CEC-494A-A097-15DC96379777,FwVolDxe
 2342CA44-3B35-4A34-995B-CEDEEB1A9576,Intel945Uga
 2354D320-3EB3-4C81-99F4-CC4AE143463E,EfiEdkCompatibilityPkgTokenSpaceGuid
-2362EA9C-84E5-4DFF-83BC-B5ACECB57CBB,gAmiCsmThunkDriverGuid
+2362EA9C-84E5-4DFF-83BC-B5ACECB57CBB,AmiCsmThunkDriverGuid
 2366C20F-E15A-11E3-8BF1-E4115B28BC50,HttpDxe
 2374EDDF-F203-4FC0-A20E-61BAD73089D6,IoTrap
 2383608E-C6D0-4E3E-858D-45DFAC3543D5,PciHostBridgeDxe
-239421F6-F025-429C-9889-AB854E00EEE6,file_CheckRaid
+239421F6-F025-429C-9889-AB854E00EEE6,CheckRaid
 23A089B3-EED5-4AC5-B2AB-43E3298C2343,VariableSmm
 23A464AD-CB83-48B8-94AB-1A6FEFCFE522,EfiSioPpiGuid
 23D1280D-43F0-4713-90B2-0E5E4221AF4C,BatteryState1
 23EED05D-1B93-4A1A-8E1B-931D69E37952,Omap35xxBoardInterruptDxe
-23F69CD0-FF46-4DB6-B982-63EDF1A901FF,gAmiTseOemPortingGuid2
+23F69CD0-FF46-4DB6-B982-63EDF1A901FF,AmiTseOemPortingGuid2
 240612B5-A063-11D4-9A3A-0090273FC14D,IsaBusDxe
 240612B5-A063-11D4-9A3A-0090273FC18E,SmmCoreDispatcher
 240612B7-A063-11D4-9A3A-0090273FC14D,UsbBusDxe
 24169E35-2454-4940-92BC-82321A2C7562,VlvInitPeim
 24486226-F8C2-41F5-B9DD-783E9E56DEA0,EfiMmioDeviceProtocolGuid
 245DCA21-FB7B-11D3-8F01-00A0C969723B,EfiPxeBaseCodeCallbackProtocolGuid
-2477BE9E-8E1A-431E-B705-14E663717377,gPsmiComboBufferGuid
+2477BE9E-8E1A-431E-B705-14E663717377,PsmiComboBufferGuid
 2480271C-09C6-4F36-AD75-5E1390BD9929,QNCSmmDispatcher
 2486829B-D3F3-47EC-827A-FC104907FC5C,SmmGenericSio
 24A2D66F-EEDD-4086-9042-F26E4797EE69,RootBridgesConnectedEventGroupGuid
@@ -586,14 +585,14 @@
 254901AD-7DB7-45F8-93C8-93D579398D9F,PeiPciSegmentLibPciCfg2
 25566B03-B577-4CBF-958C-ED663EA24380,EfiSmmGpiDispatch2ProtocolGuid
 25A4FD4A-9703-4BA9-A190-B7C84EFB3E57,FdtVariableGuid
-25A8824E-6BBF-4FB2-A200-84B0F7BECE6B,file_B57785
+25A8824E-6BBF-4FB2-A200-84B0F7BECE6B,B57785
 25ACF158-DD61-4E64-9A49-55851E9A26C7,CsmBlockIo
 25F200AA-D3CB-470A-BF51-E7D162D22E6F,ShellDebug1HiiGuid
 25F49067-A65B-48F5-BBBE-35418C488836,TcgDxeMainDxe
 263631D7-5836-4B74-BE48-EE22E92CE5D3,WinNtConsoleDxe
 26452F27-45DE-4A94-807A-0E6FDC1CB962,EmuPeiGateDxe
-266E31CC-13C5-4807-B9DC-39A6BA88FF1A,gCpuInitDataHobGuid
-26703ED8-9171-40A3-95C2-56436F8A5E56,gEfiBpCommonPkgTokenSpaceGuid
+266E31CC-13C5-4807-B9DC-39A6BA88FF1A,CpuInitDataHobGuid
+26703ED8-9171-40A3-95C2-56436F8A5E56,EfiBpCommonPkgTokenSpaceGuid
 26841BDE-920A-4E7A-9FBE-637F477143A6,Ip4ConfigDxe
 2686340E-665C-427F-8819-05BA54F030F5,IdeController2
 2688B232-9C02-4C12-BE1F-857C0FF2AAE3,TcgDxeplatform
@@ -607,14 +606,14 @@
 26EEB3DE-B689-492E-80F0-BE8BD7DA4BA7,EfiSmmConfigurationProtocolGuid
 26FDEB7E-B8AF-4CCF-AA97-02633CE48CA7,EfiProcessorSubClassGuid
 2700F72F-E0EA-4767-9A1E-D172F0704778,PeiSelStatusCode
-270279D6-2554-47BE-97D0-6AE5AD18B973,file_OemEeprom
+270279D6-2554-47BE-97D0-6AE5AD18B973,OemEeprom
 2707E46D-DBD7-41C2-9C04-C9FDB8BAD86C,JpegDecoderDxe
 271B424E-A4CC-4E0E-90A2-7EA4841F12F3,ExportHiiDb
 271DD6F2-54CB-45E6-8585-8C923C1AC706,PchS3Peim
 271F1343-20D6-4E14-9B62-3C0297F56F07,SmmPowerManagement
 274F0C8F-9E57-41D8-9966-29CCD48D31C2,SmmAccess
-2755590C-6F3C-42FA-9EA4-A3BA543CDA25,EfiDebugSupportProtocolGuid
-2799A453-FC10-4334-9E66-D3D6EF09D0EE,gAmiTseOemPortingVar5Guid
+2755590C-6F3C-42FA-9EA4-A3BA543CDA25,EfiDebuSupportProtocolGuid
+2799A453-FC10-4334-9E66-D3D6EF09D0EE,AmiTseOemPortingVar5Guid
 27ABF055-B1B8-4C26-8048-748F37BAA2DF,EfiEventExitBootServicesGuid
 27BEDA18-AE2B-43C2-AF6B-74952441DE28,MonitorKeyDxe
 27CFAC87-46CC-11D4-9A38-0090273FC14D,EfiRealTimeClockArchProtocolGuid
@@ -632,7 +631,7 @@
 28A03FF4-12B3-4305-A417-BB1A4F94081E,RamDiskDxe
 28A88A39-DD84-483F-9BEF-BA1168C2F850,UbaInitPei
 28BDE99C-E8A7-4E3E-9A8A-E66CD64F31C6,BasePciLibCf8
-28D46803-7646-4DFE-90ED-8575584ED6E6,file_AMTPolicy
+28D46803-7646-4DFE-90ED-8575584ED6E6,AMTPolicy
 2906CC1F-09CA-4457-9A4F-C212C545D3D3,AppleEpidGroupPublicKeysRl
 290B026F-6905-4612-BA0F-F635DDE35285,ErrorTriangle
 290EA249-6E88-423C-B0DA-75CDDE7920CC,AmtPetAlert
@@ -652,7 +651,7 @@
 29BE380A-FBC0-462B-A6C2-5C5A076CAFDE,ProjectPEI
 29CBB005-C972-49F3-960F-292E2202CECD,FspNotifyPhasePeim
 29CF55F8-B675-4F5D-8F2F-B87A3ECFD063,CsmVideo
-29D02CE2-4A2C-45E1-9DC1-E7049B7DB321,gSaDataHobGuid
+29D02CE2-4A2C-45E1-9DC1-E7049B7DB321,SaDataHobGuid
 29D8DD19-C836-45D9-8F05-322C27129C2A,SecureVariable
 29E0564F-B702-4352-A3A1-15FABD4A4E4A,IioCfgUpdateDxeLightningRidgeEXECB3
 29E3DB8C-3B30-49D7-9262-53FB917B9A6B,BochsVga
@@ -667,14 +666,14 @@
 2A534210-9280-41D8-AE79-CADA01A2B127,EfiDriverHealthProtocolGuid
 2A571201-4966-47F6-8B86-F31E41F32F10,EfiEventLegacyBootGuid
 2A591128-6CC7-42B1-8AF0-58933B682DBB,EfiExtendedSalMcaServicesProtocolGuid
-2A6E902B-F1F3-4275-BC7B-40FD4B5481E7,gFlashUpdBootModePpiGuid
+2A6E902B-F1F3-4275-BC7B-40FD4B5481E7,FlashUpdBootModePpiGuid
 2A72D11E-7376-40F6-9C68-23FA2FE363F1,EfiEbcSimpleDebuggerProtocolGuid
 2A7946E3-1AB2-49A9-ACCB-C6275139C1A5,TrEEDxe
 2A9D5E7F-A43A-4FC7-A25E-6E28D412FA6F,efi_pop_RT
 2AB86EF5-ECB5-4134-B556-3854CA1FE1B4,EfiPeiReadOnlyVariable2PpiGuid
 2AD0FC59-2314-4BF3-8633-13FA22A624A0,PlatformPei
 2AD511C7-1B60-4002-841D-2998DDC138EE,CryptoSMM
-2AD8E2D2-2E91-4CD1-95F5-E78FE5EBE316,gEfiUsbProtocolGuid
+2AD8E2D2-2E91-4CD1-95F5-E78FE5EBE316,EfiUsbProtocolGuid
 2ADB8F5B-C7D4-4E7E-BE2A-23634DF668A1,MouseDriver
 2AE9D80F-3FB2-4095-B7B1-E93157B946B6,EfiHashAlgorithmSha1Guid
 2B0585EB-D8B8-49A9-8B8C-E21B01AEF2B7,AppleLegacyLoad
@@ -687,15 +686,15 @@
 2B8A4061-9131-4D2A-A20B-D845D0EB1D83,Smbrun
 2B9FFB52-1B13-416F-A87B-BC930DEF92A8,TcgEventEntryHobGuid
 2BB5AFA9-FF33-417B-8497-CB773C2B93BF,CpuPei
-2BBED685-6633-455F-A840-43A22B791FFF,file_AcpiFPDTSupport
+2BBED685-6633-455F-A840-43A22B791FFF,AcpiFPDTSupport
 2BC1C74A-122F-40B2-B223-082B7465225D,FspWrapperTokenSpaceGuid
 2BDED685-F733-455F-A840-43A22B791FB3,AcpiS3SaveDxe
 2BE1E4A6-6505-43B3-9FFC-A3C8330E0432,TcgPei
 2C03C536-4594-4515-9E7A-D3D204FE1363,EfiFileExplorerProtocolGuid
 2C181BE1-8BAC-4433-873C-E5074CB5A723,UbaConfigDatabasePei
-2C194230-54B6-4C95-B809-877E83309358,ASUSGamingBoard
+2C194230-54B6-4C95-B809-877E83309358,ASUSAmingBoard
 2C29929E-27CF-4DD5-BB97-E5525791F5BA,DRYDXE
-2C6B9CB7-A13B-4EEE-80C0-1A240C8A69EE,file_IccOverClocking
+2C6B9CB7-A13B-4EEE-80C0-1A240C8A69EE,IccOverClocking
 2C6CACC6-6C3C-4AA7-B2DE-384DAE2B0352,RegAccessPeim
 2C8759D5-5C2D-66EF-925F-B66C101957E2,EfiIp6ProtocolGuid
 2C878DFE-F92E-4D00-BCED-146AFE099841,MemCacheInit
@@ -716,14 +715,14 @@
 2DA064D8-5A52-4DAC-B60F-54471A7FC372,CspFlashLibNull
 2DCBE49A-1E5B-486E-BC23-48156B8282C9,X11DxeDriver
 2DCE8BB1-BDD7-450E-B9AD-9CF4EBD4F890,EfiEventNotificationTypeCmcGuid
-2DDFEDFE-C2D5-43E3-9E10-46DB2C7C1F26,SmbiosElogSetupScreen
-2DE2AE4B-7489-4D91-9B63-9B12CC564540,file_A01DxeServiceBody
+2DDFEDFE-C2D5-43E3-9E10-46DB2C7C1F26,SmbiosEloSetupScreen
+2DE2AE4B-7489-4D91-9B63-9B12CC564540,A01DxeServiceBody
 2DE648CB-3102-43CA-A02E-42E38EA5E789,ProcessorErrorHandler
 2DEAE482-5796-40F2-8DF5-D87419D6F362,ASUSHDDPW
 2DED8109-2355-41F8-A657-D608D5CC1022,SdxcDxe
 2DF10014-CF21-4280-8C3F-E539B8EE5150,PpmPolicyInitDxe
-2E058B2B-EDC1-4431-87D9-C6C4EA102BE3,gScNvsAreaProtocolGuid
-2E1C3FF9-DC75-41C5-BD48-26087B5DC92A,gEdkiiVariableStorageIoCompletionProtocolGuid
+2E058B2B-EDC1-4431-87D9-C6C4EA102BE3,ScNvsAreaProtocolGuid
+2E1C3FF9-DC75-41C5-BD48-26087B5DC92A,EdkiiVariableStorageIoCompletionProtocolGuid
 2E3044AC-879F-490F-9760-BBDFAF695F50,EfiLegacyBiosGuid
 2E3AB8B6-AC9D-4D70-A675-54F52FB22D66,AtaPassThru
 2E3D2E75-9B2E-412D-B4B1-70416B8700FF,RecoveryOnFatFloppyDiskGuid
@@ -743,7 +742,7 @@
 2EC9DA37-EE35-4DE9-86C5-6D9A81DC38A7,AmdSevDxe
 2ECED69B-2793-4388-BA3C-823040EBCCD2,EfiOSInfo
 2EE72E7C-FB9E-4318-B888-33A315C7A91D,PpmPolicy
-2EE81ACB-64B2-41AE-8635-7030D16C4AA8,file_PchBiosWriteProtect
+2EE81ACB-64B2-41AE-8635-7030D16C4AA8,PchBiosWriteProtect
 2F08C089-2073-4BD9-9E7E-308A18327B53,IconWirelessSmall
 2F2295B6-1BB6-4CB7-BB9E-15C2C3424277,PcieSataController
 2F240E12-E14D-475C-83B0-EFFF22D77BE7,EfiKmsFormatSha512512Guid
@@ -762,11 +761,11 @@
 2FE800BE-8F01-4AA6-946B-D71388E1833F,EfiMtftp4ServiceBindingProtocolGuid
 2FF29FA7-5E80-4ED9-B380-017D3C554FF4,EfiSmmRscHandlerProtocolGuid
 300DE6C5-765C-4F89-BD6D-A623785ABC27,PchLibNull
-301AF449-E0D7-43A3-8B1B-BC16725D374B,gDxeDebugDispatchProtocolGuid
+301AF449-E0D7-43A3-8B1B-BC16725D374B,DxeDebugDispatchProtocolGuid
 3022E512-B94A-4F12-806D-7EF1177899D8,PciHotPlug
 3073D8AC-EFAB-4055-9B37-F62CD93A200A,IrqAllocatorDxe
 3079818C-46D4-4A73-AEF3-E3E46CF1EEDB,EfiBootScriptExecutorVariableGuid
-30806658-1E9C-4A13-971E-707A69E958C8,file_Int15Microcode
+30806658-1E9C-4A13-971E-707A69E958C8,Int15Microcode
 309DE7F1-7F5E-4ACE-B49C-531BE5AA95EF,EfiGenericMemTestProtocolGuid
 30AC275E-BB30-4B84-A1CD-0AF1322C89C0,PeiSpeakerInterfacePpiGuid
 30AD2B83-ADD0-414B-B11C-F93CC1D0B79B,AmiProcessTcgPpiRequestGuid
@@ -786,7 +785,7 @@
 3175E6B9-4B01-496A-9A2B-64AF02D87E34,CpuExceptionHandlerLibNull
 31878C87-0B75-11D5-9A4F-0090273FC14D,EfiSimplePointerProtocolGuid
 31A0B6EF-A400-4419-8327-0FB134AA59E7,Mxm30Dxe
-31A4878F-230D-4FC2-90BB-DA5F41A44B1B,gDxeDebugportExtProtocolGuid
+31A4878F-230D-4FC2-90BB-DA5F41A44B1B,DxeDebugportExtProtocolGuid
 31A6406A-6BDF-4E46-B2A2-EBAA89C40920,EfiHiiImageProtocolGuid
 31CA5D1A-D511-4931-B782-AE6B2B178CD7,EfiIfrFrameworkGuid
 31CE593D-108A-485D-ADB2-78F21F2966BE,EfiLegacyInterruptProtocolGuid
@@ -794,7 +793,7 @@
 31F5B262-7D9E-4FCC-9BB8-0E415D0CD748,BFGPei
 31FD7EAF-80A7-435E-8E0A-3F185F8667DD,UsbCoreDxe
 320AFE62-E593-49CB-A9F1-D4C2F4AF014C,EfiS3SmmSaveStateProtocolGuid
-320BDC39-3FA0-4BA9-BF2D-B33F72BA9CA1,gAmiTpmSupportTypeProtocolguid
+320BDC39-3FA0-4BA9-BF2D-B33F72BA9CA1,AmiTpmSupportTypeProtocolguid
 320E0C11-B5FE-4C20-B8A8-815A20700CEF,AppleIpAgentDxe
 3233B6B9-F4AC-4FE1-9021-71D0B4F0AD82,BiosMeFwLayout
 3237418A-478C-4700-B59F-768E2CCBC726,CmosDxe
@@ -816,29 +815,29 @@
 334D5254-6160-4E4A-A78C-E15D3B3B3334,MmcHost
 335984BD-E805-409A-B8F8-D27ECE5FF7A6,EfiStatusCodeSpecificDataGuid
 335B0F6A-FCBD-402A-B4BB-0C3EEDAAF9D3,EhciRouting
-336074B2-2A13-46CD-B458-FD4AEBBA28A9,gAmiGlkCpuPkgTokenSpaceGuid
+336074B2-2A13-46CD-B458-FD4AEBBA28A9,AmiGlkCpuPkgTokenSpaceGuid
 3370A4BD-8C23-4565-A2A2-065FEEDE6080,SecSMIFlash
 337F4407-5AEE-4B83-B2A7-4EADCA3088CD,EfiHiiUserCredentialFormsetGuid
 338695EA-CA84-4FA2-9DA8-5C4BB87905C6,XenioFdtDxe
-3389A820-4A27-4FA9-ADBD-39AB18078FA7,GUID_PEIM_AmdSb900PeiSmbus
+3389A820-4A27-4FA9-ADBD-39AB18078FA7,AmdSb900PeiSmbus
 339370BD-CFC6-4454-8EF7-704653120818,ThunderboltDROM
 3399DA41-CE44-4FDD-8D32-E578381FEBE0,menu_bottom_right
 339EC458-9B6A-4CEC-A47A-712873653299,StdFlashLibNull
-33C27B86-0A39-48DA-9497-68A3E5C3928D,file_OemDxeHook
+33C27B86-0A39-48DA-9497-68A3E5C3928D,OemDxeHook
 33C6406D-2F6B-41B5-8705-52BAFB633C09,AlertStandardFormatDxe
-33C6B455-87A9-4C8C-A4F6-6DB508A6260E,file_SkipScanRemovableDev
+33C6B455-87A9-4C8C-A4F6-6DB508A6260E,SkipScanRemovableDev
 33CB97AF-6C33-4C42-986B-07581FA366D4,BlockMmioToBlockIoDxe
 33D33BF3-349E-4768-9459-836A9F7558FB,DxeIoLibCpuIo2
 33FB3535-F15E-4C17-B303-5EB94595ECB6,SmmLockBox
 340436B0-EBFA-408A-9B8B-565B1F77CF2C,Lpc47N20x
 345ECC0E-0CB6-4B75-BB57-1B129C47333E,EfiPlatformToDriverConfigurationClpGuid
-346B093A-9002-4E99-A2F2-27A16C3DCD89,file_OemModifyOpRegion
+346B093A-9002-4E99-A2F2-27A16C3DCD89,OemModifyOpRegion
 3470CCF0-6054-11DD-AD8B-0800200C9A66,EzFlash
 348C4D62-BFBD-4882-9ECE-C80BB1C4783B,HiiDatabase
 348CA223-637B-4430-BAF3-1CE5D322B3FD,SetupBoot
 34989D8E-930A-4A95-AB04-2E6CFDFF6631,TcgPei
 349CF818-C0BA-4C43-929A-C8A1B1B3D255,InternalTpm2DeviceInterfaceGuid
-34B78650-B0BA-428F-87B1-A1AC762F7FBF,gEfiHeciRuntimeProtocolGuid
+34B78650-B0BA-428F-87B1-A1AC762F7FBF,EfiHeciRuntimeProtocolGuid
 34C8C28F-B61C-45A2-8F2E-89E46BECC63B,PeiVariablePei
 34CC6167-7AE7-403E-8AB2-23837F398A30,PlatformInfo
 34E5798E-F44F-4526-A08C-39BCA6E8D7D5,ProgramGPIOPei
@@ -846,9 +845,9 @@
 34FB5A1B-E3CD-4893-9403-0A39BA62FDA0,SvSmmSupport
 35034CE2-A6E5-4FB4-BABE-A0156E9B2549,PlatDriOverrideDxe
 3513C4E2-06D6-4921-9C2B-E938777BA79E,EblCmdLibNull
-35169D2C-2426-45CC-8AF4-5B618BC9A00A,gEfiHeci2PmProtocolGuid
+35169D2C-2426-45CC-8AF4-5B618BC9A00A,EfiHeci2PmProtocolGuid
 352C6AF8-315B-4BD6-B04F-31D4ED1EBE57,CbSupportPeim
-3543EC9D-4B27-4FA9-ADBD-1DE118078FA7,GUID_PEIM_AmdSb900Pei
+3543EC9D-4B27-4FA9-ADBD-1DE118078FA7,AmdSb900Pei
 3543EC9D-4B27-4FA9-ADBD-1DF118078FA7,AmdSb800_PeiPei
 355FBDA9-4572-49BC-95B9-545E71DEF9F9,FpgaSmm
 35628CFC-3CFF-444F-99C1-D5F06A069914,EfiDevicePathPropertyDatabase
@@ -859,12 +858,12 @@
 35C5AB3E-B77A-450C-8854-159B2F0D32A5,Ich7MSmmDispatcher
 35D13CFD-0BAF-11E8-AE0A-B8E8562CBAFA,AppleHpetTimerDxe
 36164812-A023-44E5-BD85-05BF3C7700AA,EfiFindFvPpiGuid
-36232936-0E76-31C8-A13A-3AF2FC1C3932,gAmiDebugServiceProtocolGuid
+36232936-0E76-31C8-A13A-3AF2FC1C3932,AmiDebuServiceProtocolGuid
 3629DDB1-228C-452E-B616-09ED316A9700,EfiPaddingNoneGuid
 362C7275-4D8F-4607-8D8F-28893A8ACD60,EpuHwModePei
 36544866-6D93-7A48-88FB-669582D2516B,ApplePlatformInfoDatabaseDxe
 3672557A-06A7-43EF-60C3-1964F3DD1198,SmcOutBand
-3677770F-EFB2-43B2-B8AE-B302E9604882,gAmiTseEventBeforeBootGuid
+3677770F-EFB2-43B2-B8AE-B302E9604882,AmiTseEventBeforeBootGuid
 3677D529-326F-4603-A926-EAACE01DCBB0,EfiPciExpressBaseAddressGuid
 368B3649-F204-4CD0-89A8-091077C070FA,AcpiPlatform
 3698D2B0-E727-4537-A636-A8770736ABFB,GetHostByDns
@@ -878,7 +877,7 @@
 3792095A-E309-4C1E-AA01-85F5655A17F1,EfiSmmAccessProtocolGuid
 3792FF94-8614-45ED-902B-1207BF1490A8,PrintThunk
 37A01080-2346-4A54-9900-D22B7B687C22,SmmPciRbIo
-37D43B2A-43A0-4AEA-AB79-E4FEF53C0F12,gMicroCodepointerGuid
+37D43B2A-43A0-4AEA-AB79-E4FEF53C0F12,MicroCodepointerGuid
 37DA43A1-BB9A-4805-9B92-0BDE11191149,ACPIRAM
 3812723D-7E48-4E29-BC27-F5A39AC94EF1,ItkDataVarGuid
 38321DBA-4FE0-4E17-8AEC-413055EAEDC1,EfiLegacy8259ProtocolGuid
@@ -889,19 +888,19 @@
 387477C1-69C7-11D2-8E39-00A0C969723B,EfiSimpleTextInProtocolGuid
 387477C2-69C7-11D2-8E39-00A0C969723B,EfiSimpleTextOutProtocolGuid
 388278D3-7B85-42F0-ABA9-FB4BFD69F5AB,EfiBluetoothIoServiceBindingProtocolGuid
-38965BB5-8097-40F5-B742-8CC14A649B64,gAmiPeiSbCustomPpiGuid
+38965BB5-8097-40F5-B742-8CC14A649B64,AmiPeiSbCustomPpiGuid
 389F751F-1838-4388-8390-CD8154BD27F8,EfiFirmwareVolumeProtocolGuid
 38A0EC22-FBE7-4911-8BC1-176E0D6C1DBD,IsaAcpi
-38D65EC3-8F39-4660-B8A6-F36AA3925475,gAmiBdsConnectPolicyProtocolGuid
+38D65EC3-8F39-4660-B8A6-F36AA3925475,AmiBdsConnectPolicyProtocolGuid
 38DDFE8F-8991-44AA-9889-83F4918465B0,EfiGpioOperationProtocolGuid
 38E93FAE-C5F4-4700-940D-DC10E2FDB6C0,OemPeiRuntime
 39045756-FCA3-49BD-8DAE-C7BAE8389AFF,Tcg2Dxe
-39136FC7-1A11-49DE-BF35-0E78DDB524FC,gEfiLegacySpiControllerProtocolGuid
+39136FC7-1A11-49DE-BF35-0E78DDB524FC,EfiLegacySpiControllerProtocolGuid
 3915886B-D833-4C23-B3ED-1453CCE7C5F2,IioCfgUpdateDxeLightningRidgeEXECB2
 3920405B-C897-44DA-88F3-4C498A6FF736,EfiSmmIchnDispatchExProtocolGuid
 392744DA-DF68-4C3B-966B-F20F0F47BC23,acer_SetupUtility_interface
 395C33FE-287F-413E-A055-8088C0E1D43E,SmmRsTableGuid
-396E583B-D2DD-45F6-86E8-119885777CDE,file_SmmAtaLegacy
+396E583B-D2DD-45F6-86E8-119885777CDE,SmmAtaLegacy
 398262C1-5165-4725-87FC-BB786A972582,IchPowerButton
 399CF3A7-82C7-4D9B-9123-DB11842986D3,DpcDxe
 39B3CE2B-82D0-4C7E-B949-D5E65181B98A,IshFwLayout
@@ -915,11 +914,11 @@
 3A3300AB-C929-487D-AB34-159BC13562C0,PchResetCallbackProtocolGuid
 3A35EE58-8286-4F00-9A5B-1B6AB7680815,amiFVhoblistguid
 3A4D7A7C-018A-4B42-81B3-DC10E3B591BD,UsbKeyboardLayoutKeyGuid
-3A4E4376-4871-4B0E-A02F-ED36F2AECD00,gAmiCsmVideoPolicyProtocolGuid
-3A53114D-5673-4DD9-B5B3-CB72C347669B,BFGSmm
+3A4E4376-4871-4B0E-A02F-ED36F2AECD00,AmiCsmVideoPolicyProtocolGuid
+3A53114D-5673-4DD9-B5B3-CB72C347669B,BFSmm
 3A61FD45-69A0-42AD-B261-24DA451BF442,ForceRecovery
-3A666558-43E3-4D25-9169-DB81F5DB42E1,gPKeyFileX509Guid
-3AA83745-9454-4F7A-A7C0-90DBD02FAB8E,gBdsConnectDriversProtocolGuid
+3A666558-43E3-4D25-9169-DB81F5DB42E1,PKeyFileX509Guid
+3AA83745-9454-4F7A-A7C0-90DBD02FAB8E,BdsConnectDriversProtocolGuid
 3AB14680-5D3F-4A4D-BCDC-CC380018C7F7,EfiDiskInfoNvmeInterfaceGuid
 3AB6529E-6F90-4863-AFFA-F5BA08DEA9AA,SbBeepLibPcAt
 3ACC966D-8E33-45C6-B4FE-62724BCD15A9,AhciBusDxe
@@ -933,7 +932,7 @@
 3B1DEAB5-C75D-442E-9238-8E2FFB62B0BB,UefiPxe4BcDxe
 3B1E4B7C-09D8-944F-A408-1309EB8B4427,EmuThreadThunkProtocolGuid
 3B24F79D-91A0-46FF-BE29-458AE211FAC5,KbcEmul
-3B3EE27E-9BEF-463F-B03A-A5C9A098B7B5,gCpuOverclockingConfigGuid
+3B3EE27E-9BEF-463F-B03A-A5C9A098B7B5,CpuOverclockingConfigGuid
 3B42EF57-16D3-44CB-8632-9FDB06B41451,MemoryInit
 3B43161F-AEB4-43EC-9E1B-8050171B4899,BiosGuardRecoveryHook
 3B4D9B23-95AC-44F6-9FCD-0E9594586C72,BdsLibStringPackageGuid
@@ -944,8 +943,8 @@
 3BBCB209-26C8-4BA9-AD25-B95B45A04D26,BatteryState3
 3BC1B285-8A15-4A82-AABF-4D7D13FB3265,EfiBusSpecificDriverOverrideProtocolGuid
 3BC1F6DE-693E-4547-A300-21823CA420B2,PeiUsbControllerPpiGuid
-3BC2BD12-AD2E-11D5-87DD-00062945C3B9,gCpuStatusCodeDataTypeExceptionHandlerGuid
-3BC42C6D-ABEC-41BA-8CCB-D8E0EF1CEF85,file_PCHPolicy
+3BC2BD12-AD2E-11D5-87DD-00062945C3B9,CpuStatusCodeDataTypeExceptionHandlerGuid
+3BC42C6D-ABEC-41BA-8CCB-D8E0EF1CEF85,PCHPolicy
 3BD2A492-96C0-4079-B420-FCF98EF103ED,EfiCertX509Sha256Guid
 3BD2F4EC-E524-46E4-A9D8-510117425562,EfiHiiStandardFormGuid
 3BEB6B06-09CE-4386-8884-F323ADD04F1F,GlobeTile
@@ -960,11 +959,11 @@
 3C5C987D-7996-4415-8B16-9F4A8AD36FDD,Int10ToSmiDxe
 3C699197-093C-4C69-B06B-128AE3481DC9,EfiAcpiDescriptionGuid
 3C7200E9-005F-4EA4-87DE-A3DFAC8A27C3,EfiShellDynamicCommandProtocolGuid
-3C7BC880-41F8-4869-AEFC-870A3ED28299,gEfiHeciProtocolGuid
+3C7BC880-41F8-4869-AEFC-870A3ED28299,EfiHeciProtocolGuid
 3C7D193C-682C-4C14-A68F-552DEA4F437E,PcdDataBaseSignatureGuid
 3C8B9970-870A-11E4-B7C6-B8E8562CBAFA,ChipsetGpioDxe
 3C8D294C-5FC3-4451-BB31-C4C032295E6C,IdleLoopEventGuid
-3CA59AB6-67CB-4385-9EDD-407C49F0D9BC,GUID_DRVR_AMIOSB
+3CA59AB6-67CB-4385-9EDD-407C49F0D9BC,AMIOSB
 3CCD3DD8-8D45-4FED-962D-2B38CD82B3C4,UserIdentifyManagerGuid
 3CD652B4-6D33-4DCE-89DB-83DF9766FCCA,EfiVectorHandoffInfoPpiGuid
 3CDC90C6-13FB-4A75-9E79-59E9DD78B9FA,EfiPeiReadOnlyVariablePpiGuid
@@ -987,17 +986,17 @@
 3E591C00-9E4A-11DF-9244-0002A5D5C51B,EfiMmcHostProtocolGuid
 3E625104-1920-44B1-AE2C-1BDA57ED73EA,KtiRas
 3E745226-9818-45B6-A2AC-D7CD0E8BA2BC,EfiUsb2HcProtocolGuid
-3E7D2B56-3F47-42AA-8F6B-22F519818DAB,gScPcieSmiDispatchProtocolGuid
-3EA824D1-81E3-4FF5-BD43-BB9C65DF7C46,gAmiCsmStartedProtocolGuid
+3E7D2B56-3F47-42AA-8F6B-22F519818DAB,ScPcieSmiDispatchProtocolGuid
+3EA824D1-81E3-4FF5-BD43-BB9C65DF7C46,AmiCsmStartedProtocolGuid
 3EAF5E3A-E4B2-48E6-A9F1-B75CF204BCC8,PeiBoardConfigInit
 3EB9F0D3-40D0-435B-B692-809151807FF4,TCM_MPDriver
 3EBD8C7C-733B-4667-8FD1-4ABEA366C95B,ASUSDirectKeyPEI
 3EBD9E82-2C78-4DE6-9786-8D4BFCB7C881,EfiFaultTolerantWriteProtocolGuid
-3EBDAF20-6667-40D8-B4EE-F5999AC1B71F,gEfiSecHobDataPpiGuid
+3EBDAF20-6667-40D8-B4EE-F5999AC1B71F,EfiSecHobDataPpiGuid
 3EBFA8E6-511D-4B5B-A95F-FB38260F1C27,DeviceManagerFormSetGuid
-3ED700B5-3A13-43BE-9450-00122E8B83D7,file_DataHubRecordPolicy
-3EF7500E-CF55-474F-8E7E-009E0EACECD2,gAmiUsbSmmProtocolGuid
-3F5A74B2-BF80-4850-8591-4F2DF5F9CB2B,gPhoenixGdiProtocolGuid
+3ED700B5-3A13-43BE-9450-00122E8B83D7,DataHubRecordPolicy
+3EF7500E-CF55-474F-8E7E-009E0EACECD2,AmiUsbSmmProtocolGuid
+3F5A74B2-BF80-4850-8591-4F2DF5F9CB2B,PhoenixGdiProtocolGuid
 3F7753EF-D36F-45CC-8A1A-2EAAFF1038B6,PciPlatform
 3F78CB8D-72EE-414E-B023-DACA003BDDF5,ProjectSxSMI
 3F78CB8D-72EE-414E-B023-DACA003EFCDE,APM
@@ -1021,14 +1020,14 @@
 405B2307-6839-4D52-AEB9-BECE64252800,ArmFvpDxe
 405DA936-3737-4C0C-8E3F-E6172A568592,FileExplorerDxe
 405F8FE6-5213-4B85-B821-97B77AFF795B,ASM104X_DXE
-407868F3-D1A7-46C6-9FCB-6F67A5E3C7D9,gHdAudioConfigGuid
+407868F3-D1A7-46C6-9FCB-6F67A5E3C7D9,HdAudioConfigGuid
 407B4008-BF5B-11DF-9547-CF16E0D72085,PL111LcdGraphicsDxe
 408EDCEC-CF6D-477C-A5A8-B4844E3DE281,ConSplitterDxe
 40B09B5A-F0EF-4627-93D5-27F04B754D05,AmtReadyToBootGuid
 40BEAB40-CECE-4909-B133-20A413AE19E9,CpuMpDxe
 40E064B2-0AE0-48B1-A07D-F8CF1E1A2310,EfiNetworkPkgTokenSpaceGuid
 40FDF4FC-B7CC-4AC5-9BA2-A050D26656A7,SmcOptimizePei
-41015350-BA3B-4916-B043-4615408A87B3,GUID_DRVR_OememSmiCore
+41015350-BA3B-4916-B043-4615408A87B3,OememSmiCore
 410C1D0C-656F-4769-8DFB-90F9A0303E9F,IconFireWireHD
 4110465D-5FF3-4F4B-B580-24ED0D06747A,SmbiosPlatformDxe
 41292206-4069-42A6-AC38-C4A5C123C6E5,BaseTraceHubLibNull
@@ -1041,8 +1040,8 @@
 41D94CD2-35B6-455A-8258-D4E51334AADD,EfiIp4ProtocolGuid
 41E26B9C-ADA6-45B3-808E-2357A35B60D6,ArmBootMonFsFileInfoGuid
 41E89AB0-BD3D-44B6-A431-E4836EFBF2CB,PowerManagement2_
-42293093-76B9-4482-8C02-3BEFDEA9B35D,TcgSmm
-4250CEC2-DDDB-400B-8C62-CF9864F6D154,gAmiSioPortCompatibilityProtocolGuid
+42293093-76B9-4482-8C02-3BEFDEA9B35D,TcSmm
+4250CEC2-DDDB-400B-8C62-CF9864F6D154,AmiSioPortCompatibilityProtocolGuid
 4278A574-4769-4D60-B090-DD4916691590,RecoveryModuleLoadPei
 42857F0A-13F2-4B21-8A23-53D3F714B840,CapsuleRuntimeDxe
 42881C98-A4F3-44B0-A39D-DFA18667D8CD,EfiHashServiceBindingProtocolGuid
@@ -1054,7 +1053,7 @@
 42FCB444-B881-49D8-A6E9-5A1695FC9F3E,SysPassword
 4308B1F6-60F0-49FE-9E51-3A25992515BF,PoofAnimationState0
 430AC2F7-EEC6-4093-94F7-9F825A7C1C40,SdDxe
-4311EDC0-6054-46D4-9E40-893EA952FCCC,gEfiHiiPopupProtocolGuid
+4311EDC0-6054-46D4-9E40-893EA952FCCC,EfiHiiPopupProtocolGuid
 43172851-CF7E-4345-9FE0-D7012BB17B88,iFfsSmm
 4344558D-4EF9-4725-B1E4-3376E8D6974F,ShellLevel3HiiGuid
 4356B162-D0B2-11E1-8952-4437E6A60EA5,Lan9118Dxe
@@ -1069,10 +1068,10 @@
 43BE0B44-874B-4EAD-B09C-241A4FBD7EB3,EfiKmsFormatGeneric1024Guid
 43E7ABDD-E352-4CFB-A230-4CDC1D350E5C,GraphicsConsole
 4414D6D8-232C-4972-A4F7-2B21D4298786,I2cHost
-441FFA18-8714-421E-8C95-587080796FEE,gAmiSmmDebugServiceProtocolGuid
+441FFA18-8714-421E-8C95-587080796FEE,AmiSmmDebuServiceProtocolGuid
 4426CCB2-E684-4A8A-AE40-20D4B025B710,EfiPeiS3ResumePpiGuid
 442BE18B-CA6E-4A23-9A99-9AFE8A213A32,PlatformPeiSystemInformation
-44577A0D-361A-45B2-B33D-BB9EE60D5A4F,gArmRealViewEbPkgTokenSpaceGuid
+44577A0D-361A-45B2-B33D-BB9EE60D5A4F,ArmRealViewEbPkgTokenSpaceGuid
 44640C32-33D7-4FB0-B1F9-6C7B232E994D,SpsPei
 446DBF63-2502-4CDA-BCFA-2465D2B0FE9D,EfiCertX509Sha512Guid
 447559F0-D02E-4CF1-99BC-CA11654054C2,StdLibTokenSpaceGuid
@@ -1090,14 +1089,14 @@
 453C5E5A-482D-43F0-87C9-5941F3A38AC2,EfiKmsFormatSha1160Guid
 45424D0C-E6AF-4AF2-AD99-FA77168742D1,SmartTimerDxe
 4549AB47-6E60-4293-B91D-31B610AD8056,EfiEsrtOperationProtocolGuid
-454DB25C-E506-4F90-A6DF-69E0223E3F2B,gPramAddrDataGuid
+454DB25C-E506-4F90-A6DF-69E0223E3F2B,PramAddrDataGuid
 4551F2F5-C684-4F27-936F-C7B04A5C5FF1,SecureBootDXE
 455D16DC-E3AF-4B5F-A9AD-A4BC198085BD,BaseDebugDeviceLibNull
 456D2859-A84B-4E47-A2EE-3276D886997D,EfiSmmSxDispatch2ProtocolGuid
 4579B72D-7EC4-4DD4-8486-083C86B182A7,IScsi4Dxe
 459504D7-72D7-4BB2-956D-C9FA899920E8,OemFwLnk
 459C70C3-9344-4484-9F93-7822530D0D11,MePciPlatform
-45AC8863-E3FA-4A38-A23C-00BCD10CBD50,gAmiNvramSmmCommunicationGuid
+45AC8863-E3FA-4A38-A23C-00BCD10CBD50,AmiNvramSmmCommunicationGuid
 45BCD98E-59AD-4174-9546-344A07485898,EfiSupplicantServiceBindingProtocolGuid
 45D68DB9-8B4E-48C0-99E9-F21F262DB653,XhciPei
 45F9602A-3475-4D1E-9FE9-BAC99F42AD49,AppleBacklightController
@@ -1105,7 +1104,7 @@
 462CAA21-7614-4503-836E-8AB6F4662331,UiApp
 46310243-7B03-4132-BE44-2243FACA7CDD,CMDB
 465FDE84-E8B0-B04B-A843-A03F68F617A9,ThunkPpiList
-466C4F69-2CE5-4163-99E7-5A673F9C431C,file_VGAInformation
+466C4F69-2CE5-4163-99E7-5A673F9C431C,VGAInformation
 467313DE-4E30-43F1-943E-323F89845DB5,EfiBluetoothIoProtocolGuid
 46805D61-0BB8-4680-A9BE-C96C751AB5A4,BaseIpmiLibNull
 469FC080-AEC1-11DF-927C-0002A5D5C51B,ArmPlatformPrePeiCore
@@ -1115,7 +1114,7 @@
 46F9D8DA-2670-44B2-9E42-C9B130CE2465,SmbiosMisc
 470CB248-E8AC-473C-BB4F-81069A1FE6FD,SmmFaultTolerantWriteDxe
 470E1529-B79E-4E32-A0FE-6A156D29F9B2,EfiBootScriptSaveProtocolGuid
-47144F62-B423-4524-AC6A-90106BAA89FB,gAmiTpm20MeasureConfigurationInfoGuid
+47144F62-B423-4524-AC6A-90106BAA89FB,AmiTpm20MeasureConfigurationInfoGuid
 472A583E-70CF-465A-BB77-53ADFCDB5883,OCMR_DXE
 4776E33F-DB47-479A-A25F-A1CD0AFAB38B,EfiKmsFormatAesxts128Guid
 47889FB2-D671-4FAB-A0CA-DF0E44DF70D6,EfiPkcs7VerifyProtocolGuid
@@ -1124,17 +1123,17 @@
 47B7FA8C-F4BD-4AF6-8200-333086F0D2C8,EfiSmmReadyToLockProtocolGuid
 47C7B221-C42A-11D2-8E57-00A0C969723B,EfiShellEnvironment2Guid
 47C7B223-C42A-11D2-8E57-00A0C969723B,EfiShellInterfaceGuid
-47E87E67-FBC0-4C01-9002-4A0A6ECB92FF,gAmiTseOemPortingVar4Guid
+47E87E67-FBC0-4C01-9002-4A0A6ECB92FF,AmiTseOemPortingVar4Guid
 47F48C99-CB23-4CF8-9D7D-CE7C86EF22A3,UsbTouchPanelDxe
 47FD99EB-C1E6-4F77-A31A-9F7FB4A8E7DE,menu_down_arrow
 480F8AE9-0C46-4AA9-BC89-DB9FBA619806,EfiDpcProtocolGuid
 4839023B-4C12-4EB2-B2B8-C91B42D878A0,IsctAcpi
 4862AFF3-667C-5458-B274-A1C62DF8BA80,HeciInit
-48925241-D2ED-46D4-8A87-A18D153C2802,file_SmmOemEeprom
+48925241-D2ED-46D4-8A87-A18D153C2802,SmmOemEeprom
 4896840D-46BB-412B-A30A-A62ABFB3682F,SpsAcpiSsdt
 48AB7F57-DC34-4F6C-A7D3-B0B5B0A74314,EfiIa32X64ErrorTypeMsCheckGuid
 48D51913-F340-4798-83D7-5CAB3D5C6DA7,AppleEffaceableBCENOR
-48E40CAD-A6D2-4756-8AEB-81F468D4A856,gTpm20ShutdownOverrideguid
+48E40CAD-A6D2-4756-8AEB-81F468D4A856,Tpm20ShutdownOverrideguid
 48ECB431-FB72-45C0-A922-F458FE040BD5,EfiEdidOverrideProtocolGuid
 48FB21BF-47E5-406C-A73E-D83D00767214,FwhFlashPeiLibNull
 4904B42F-9FC0-4C2E-BB3F-A2AB35123530,DebugAgentLibNull
@@ -1163,16 +1162,16 @@
 4ACA697E-F883-446F-98F7-096416FFFFFF,OhciDxe
 4AE7E1E8-9DFE-4E3E-85B4-A5F6ABD470FB,Cpuid
 4B0165A9-61D6-4E23-A0B5-3EC79C2E30D5,DxePchPlatformPolicyProtocolGuid
-4B215191-9A25-43FD-86B5-74E7AF723315,gAmiNvmePassThruProtocolGuid
+4B215191-9A25-43FD-86B5-74E7AF723315,AmiNvmePassThruProtocolGuid
 4B28E4C7-FF36-4E10-93CF-A82159E777C5,ResetSystemRuntimeDxe
 4B3029CC-6B98-47FB-BC96-76DCB80441F0,EfiDiskInfoUfsInterfaceGuid
-4B3082A3-80C6-4D7E-9CD0-583917265DF1,gAmiSmbiosNvramGuid
+4B3082A3-80C6-4D7E-9CD0-583917265DF1,AmiSmbiosNvramGuid
 4B3828AE-0ACE-45B6-8CDB-DAFC28BBF8C5,VAROEM
 4B47D616-A8D6-4552-9D44-CCAD2E0F4CF9,IScsiConfigGuid
-4B4D31BE-88C6-446A-A4A9-4AD0F612B32E,gEvaluateDefaults4FirstBootGuid
+4B4D31BE-88C6-446A-A4A9-4AD0F612B32E,EvaluateDefaults4FirstBootGuid
 4B680E2D-0D63-4F62-B930-7AE995B9B3A3,SmBusDxe
 4B837B03-6587-4D19-B82B-EDFAD836C0A0,SecMain
-4B94F4FD-8FB9-4CF1-A0D8-EA03B4467BE2,file_OemThermal
+4B94F4FD-8FB9-4CF1-A0D8-EA03B4467BE2,OemThermal
 4BB346D2-8076-4671-8BC9-7B95CBB9A6DF,MonoStatusCode
 4BC80B15-255D-4858-8072-51D6D98CF90E,SetHostName
 4BD56BE3-4975-4D8A-A0AD-C491204B5D4D,EfiAdapterInfoUndiIpv6SupportGuid
@@ -1180,7 +1179,7 @@
 4C19049F-4137-4DD3-9C10-8B97A83FFDFA,EfiMemoryTypeInformationGuid
 4C26DF71-EBE7-4DEA-B5E2-0B5980433908,GetAddrInfo
 4C494E55-5849-5342-4554-544552212121,SlpSupport
-4C5C6A74-BAB7-46D6-8688-3B2E7F246E3F,SataController_
+4C5C6A74-BAB7-46D6-8688-3B2E7F246E3F,SataController
 4C6E0267-C77D-410D-8100-1495911A989D,MetronomeDxe
 4C862FC6-0E54-4E36-8C8F-FF6F3167951F,FtwLiteDxe
 4C8A2451-C207-405B-9694-99EA13251341,EfiDebugMaskProtocolGuid
@@ -1210,7 +1209,7 @@
 4DE01DE6-7CBB-4786-9F2A-9B9C7C97AC06,S3RestoreAcpiPei
 4DF19259-DC71-4D46-BEF1-357BB578C418,EfiPs2PolicyProtocolGuid
 4DF53F89-D421-4F9D-8392-BE3BECC6288E,AhciInt13Dxe
-4E0F9BD4-E338-4B26-843E-BD3AD9B2837B,gPRKeyGuid
+4E0F9BD4-E338-4B26-843E-BD3AD9B2837B,PRKeyGuid
 4E11E955-CCCA-11D4-BD0D-0080C73C8881,EfiWinNtGopGuid
 4E1356C2-0EED-463F-8147-9933ABDBC7D5,EfiKmsFormatRsasha2563072Guid
 4E1C4F95-90EA-47DE-9ACC-B8920189A1F5,SecPeiFspPlatformSecLibSample
@@ -1218,7 +1217,7 @@
 4E292F96-D843-4A55-A8C2-D481F27EBEEE,EfiEventNotificationTypeCpeGuid
 4E304BC0-3B03-4A97-BB55-91375189A31D,iFlashDxeBin
 4E3A82E6-E43F-460A-866E-9B5AAB804448,EslIp4ServiceGuid
-4E509696-E33F-408E-9AF5-CC8C20065385,gSoftwareGuardConfigGuid
+4E509696-E33F-408E-9AF5-CC8C20065385,SoftwareGuardConfigGuid
 4E76928F-50AD-4334-B06B-A84213108A57,NtFwhPpiGuid
 4E82091E-32A1-4689-8A00-CDE41ED63CDD,SioDxeInit
 4E8F4EBB-64B9-4E05-9B18-4CFE49235097,EfiMemorySubClassGuid
@@ -1237,12 +1236,12 @@
 4F792E68-E8C8-794E-B1D8-3703F3F2D5A5,EmulatorPkgTokenSpaceGuid
 4F821C7C-8E33-412A-AE63-D149F376CD1B,SmmWheaDxe
 4F89E208-E144-4804-9EC8-0F894F7E36D7,EfiPeiSectionExtractionPpiGuid
-4F9147CB-972E-4F5C-B869-A02182C9D93C,GUID_DRVR_PataController
+4F9147CB-972E-4F5C-B869-A02182C9D93C,PataController
 4F921013-4F71-4C6C-BCF8-419B2B801932,SetupBrowser2
 4F948815-B4B9-43CB-8A33-90E060B34955,EfiUdp6ProtocolGuid
 4FA7E1F2-CE8B-4D38-A3F8-342DC4515446,IioCfgUpdateDxeNeonCityEPRP
 4FB2CE1F-1A3A-42E3-BD0C-7B84F954189A,AcpiCallbacksSmm
-4FC0733F-6FD2-491B-A890-5374521BF48F,gAmiBoardInfo2ProtocolGuid
+4FC0733F-6FD2-491B-A890-5374521BF48F,AmiBoardInfo2ProtocolGuid
 4FD1BA49-8F90-471A-A2C9-173C7A732FD0,SeCfTPMPolicyPpiGuid
 4FE772E8-FE3E-4086-B638-8C493C490488,PhysicalPresencePei
 4FF2E88A-A404-46F7-9A2A-35E00844F6E6,SpiDeviceDxe
@@ -1257,33 +1256,33 @@
 506533A6-E626-4500-B14F-17939C0E5B60,AcpiSupportDxe
 5074C00E-698B-4763-91E6-41663F6CC7C9,PBSPeiInitPei
 508A61DC-2C57-4848-A54A-58015179C94A,ApplePowerState
-5091388A-4BB6-4DA5-A493-5EE7A90CEA5E,GUID_PEIM_OemBoardID
+5091388A-4BB6-4DA5-A493-5EE7A90CEA5E,OemBoardID
 50A18017-37AD-8743-BCF2-DF1A8FF12FAB,EmuReset
 50B4FAD4-9D0D-440B-812C-D8E3EC21244D,XhciHandlerCommon
-50DC5C90-1D33-4FD6-87E5-063B1DFA2170,gAmiSerialProtocolGuid
-50F6096D-7C98-4C78-9A1D-C5A1833B6A88,AmiTcgNvflagSample
-510DF6A1-B6C1-4948-AEE7-59F220F898BD,GUID_DRVR_SataController
+50DC5C90-1D33-4FD6-87E5-063B1DFA2170,AmiSerialProtocolGuid
+50F6096D-7C98-4C78-9A1D-C5A1833B6A88,AmiTcgNvflaSample
+510DF6A1-B6C1-4948-AEE7-59F220F898BD,SataController
 51116915-C34B-4D8E-86DB-6A70F2E60DAA,NVMe
 51116915-C34B-4D8E-86DB-6A70F2E60DAC,IOBufferCopyController
 5112A2AA-E175-477E-A4E4-D0B7E689BA9F,EventLogDxe
 5122FA7B-17A3-4A8B-89AE-A93ADE92EADF,DigitalThermalSensor
 51271E13-7DE3-43AF-8BC2-71AD3B824325,ShellMapGuid
-514D2AFD-2096-4283-9DA6-700CD27DC7A5,gScSmmIoTrapControlGuid
+514D2AFD-2096-4283-9DA6-700CD27DC7A5,ScSmmIoTrapControlGuid
 5167FD5D-AAA2-4FE1-9D0D-5CFCAB36C14C,LegacyRegion2OnLegacyRegionThunk
 5169AF60-8C5A-4243-B3E9-56C56D18EE26,SmmIpmiProtocolGuid
 51739E2A-A022-4D73-ADB9-91F0C9BC7142,MpServicesOnFrameworkMpServicesThunk
 51924AE9-BE81-4820-94BA-7C9546E702D0,Tcg2PpVendorLibNull
 5199296F-2808-4AFA-94C4-99F6B06C871E,ACPIS4Smm
 51AA59DE-FDF2-4EA3-BC63-875FB7842EE9,EfiHashAlgorithmSha256Guid
-51AA65FC-82B6-49E6-95E2-E6827A8D7DB4,gAmiHddHpaProtocolGuid
+51AA65FC-82B6-49E6-95E2-E6827A8D7DB4,AmiHddHpaProtocolGuid
 51C4C059-67F0-4E3C-9A55-FF42A8291C8C,PeiSmbusLibSmbusPpi
 51C9F40C-5243-4473-B265-B3C8FFAFF9FA,Crc32SectionExtractDxe
 51CCF399-4FDF-4E55-A45B-E123F84D456A,ConPlatformDxe
-51E9B4F9-555D-476C-8BB5-BD18D9A68878,gEfiAmiSioProtocolGuid
+51E9B4F9-555D-476C-8BB5-BD18D9A68878,EfiAmiSioProtocolGuid
 523FA0E8-8639-47BB-B859-939A450DBF77,EnhancedFat
 5242AADB-BDAB-4B92-B7D5-A58B6E0EEE6B,IchSmbusArpDisabledPei
 524685A0-89A0-11E3-9D4D-BFA9F6A40308,AndroidFastbootPlatformProtocolGuid
-525B672C-8C8F-0361-AE8E-565EE0F563B8,file_MemInfo
+525B672C-8C8F-0361-AE8E-565EE0F563B8,MemInfo
 52715B77-04A5-487A-B980-CDC371B5BEC8,AsusPostErrPei
 529D3F93-E8E9-4E73-B1E1-BDF6A9D50113,ArpDxe
 52B3DBA7-9565-48E8-8E13-EC7196721B3C,PlatformInfoPei
@@ -1294,7 +1293,7 @@
 52DAA304-DEB3-449B-AFB8-A88A54F28F95,OhciPei
 52F934EE-7F15-4723-90CF-4E37127718A5,TcgPeiPei
 534A6A34-CF78-4A56-BEDB-CB49A8D8060C,RTCWakeup
-534BA4FD-D74C-1E41-AA7D-BB551364FBAD,AppleDebugSupportDxe
+534BA4FD-D74C-1E41-AA7D-BB551364FBAD,AppleDebuSupportDxe
 53531469-558E-4AF1-803A-F966F27C573B,BatteryState2
 535A720E-06C0-4BB9-B563-452216ABBED4,HdLcdArmVExpress
 5360BFF6-3911-4495-AE3C-B02FF004B585,DxePciLibI440FxQ35
@@ -1304,8 +1303,8 @@
 53BCC14F-C24F-434C-B294-8ED2D4CC1860,DataHubDxe
 53CD299F-2BC1-40C0-8C07-23F64FDB30E0,EdkiiPlatformLogoProtocolGuid
 53F019E9-BB0C-424B-870A-1FAF10B1CB4C,iFfsPei
-541D5A75-95EE-43C7-9E5D-2394DC486249,gAmiTseAdminPasswordValidGuid
-542D6248-4198-4960-9F59-2384646D63B4,gAmiOpromPolicyProtocolGuid
+541D5A75-95EE-43C7-9E5D-2394DC486249,AmiTseAdminPasswordValidGuid
+542D6248-4198-4960-9F59-2384646D63B4,AmiOpromPolicyProtocolGuid
 543323CE-9F0C-4DDF-A33C-BC3B3A5AC227,SmmBmcElog
 5446C293-339B-47CD-B719-585DE39408CC,PostReport
 5473C07A-3DCB-4DCA-BD6F-1E9689E7349A,EfiFirmwareFileSystem3Guid
@@ -1315,14 +1314,14 @@
 547C5CAE-2640-4ACF-9532-0E25B3F03F05,WheaDxe
 54891A9E-763E-4377-8841-8D5C90D88CDE,TerminalSrc
 54975633-0945-4D9C-97C2-E0CC6469A5A3,MeLibPei
-54A85D82-3A54-4006-9C0E-E527295C4FA8,SetupLangService
+54A85D82-3A54-4006-9C0E-E527295C4FA8,SetupLanService
 54AB7A17-AD08-4F86-83C2-4CF398EBC0AD,AsusPostErrDxe
-54CE6010-2A6D-42AA-B1E2-FD97DE9C4DA8,AppleDebugSupportFireWireInit
+54CE6010-2A6D-42AA-B1E2-FD97DE9C4DA8,AppleDebuSupportFireWireInit
 54D2878F-25CD-4A2B-8420-EBD18E609C76,OemHookStatusCodeLibNull
 54FCC43E-AA89-4333-9A85-CDEA24051E9E,EfiSupplicantProtocolGuid
 5507247A-846B-4F22-B55F-72B4049435EF,AmtLockKBD
 5507E3F0-9C84-47DC-8CEA-C29A01B7CD5D,SioBdsPlugin
-550E42E1-B6FA-4E99-BBD9-1A901F001D7A,gAmiVendorKeysNvGuid
+550E42E1-B6FA-4E99-BBD9-1A901F001D7A,AmiVendorKeysNvGuid
 553087F6-BAAC-4D7F-97B4-31D8179AAE15,GetNameInfo
 5542CCE1-DF5C-4D1B-ABCA-364F77D399FB,EfiHiiCompatibilityProtocolGuid
 5552575A-7E00-4D61-A3A4-F7547351B49E,SmmBaseRuntime
@@ -1335,9 +1334,9 @@
 55E76644-78A5-4A82-A900-7126A5798892,HeciInitDxe
 5604D863-BF24-439B-BBF6-636D72036E07,SpiUtil
 560BF58A-1E0D-4D7E-953F-2980A261E031,EfiSioVariableGuid
-5639867A-8C8E-408D-AC2F-4B61BDC0BBBB,gEfiBluetoothAttributeServiceBindingProtocolGuid
+5639867A-8C8E-408D-AC2F-4B61BDC0BBBB,EfiBluetoothAttributeServiceBindingProtocolGuid
 563C75D2-045D-43FD-A7C0-A472B0AD0255,gear6
-563F8EDE-1FA5-45A2-BE23-B0B6A07DE239,gDramPolicyPpiGuid
+563F8EDE-1FA5-45A2-BE23-B0B6A07DE239,DramPolicyPpiGuid
 56417BED-6BBE-4882-86A0-3AE8BB17F8F9,EfiKmsFormatRsasha11024Guid
 564B33CD-C92A-4593-90BF-2473E43C6322,EfiHobMemoryAllocBspStoreGuid
 565D3FCA-F06D-4FED-95EB-370EDFFA9E57,AsrBootOptionDxe
@@ -1353,14 +1352,14 @@
 578C315A-68CF-4E81-B5C6-22DB40D010BC,EfiI2cMasterProtocolGuid
 57E56594-CE95-46AD-9531-3C49310CA7CE,OFBD
 57F55732-CF55-43C7-B66B-216CE2282888,MonoStatusCodePei
-5802BCE4-EEEE-4E33-A130-EBAD27F0E439,MsegSmramGuid
+5802BCE4-EEEE-4E33-A130-EBAD27F0E439,MseSmramGuid
 58053681-13F3-47F6-B137-CDB3E888D9A4,ExtendedDataGuid
 580DD900-385D-11D7-883A-00500473D4EB,UHCD
 5810798A-ED30-4080-8DD7-B9667A748C02,HashInstanceLibSha256
 5820EEB4-C135-4854-9D2A-AA9EFC4475E9,MeFwDowngrade
-5848FD2D-D6AF-474B-8275-95DDE70AE823,gSmramCpuDataHeaderGuid
-584CC99F-4BE8-43D1-A45A-933DC39479FC,gAmiPeiNbCustomPpiGuid
-5859CB76-6BEF-468A-BE2D-B3DD1A27F012,gEfiUsbPolicyProtocolGuid
+5848FD2D-D6AF-474B-8275-95DDE70AE823,SmramCpuDataHeaderGuid
+584CC99F-4BE8-43D1-A45A-933DC39479FC,AmiPeiNbCustomPpiGuid
+5859CB76-6BEF-468A-BE2D-B3DD1A27F012,EfiUsbPolicyProtocolGuid
 587E72D7-CC50-4F79-8209-CA291FC1A10F,EfiHiiConfigRoutingProtocolGuid
 58830DE7-9739-4869-88BE-DC8CA24CE9C1,AutoMeud
 58A90A52-929F-44F8-AC35-A7E1AB18AC91,FPVARBAK
@@ -1368,14 +1367,14 @@
 58DC368D-7BFA-4E77-ABBC-0E29418DF930,EfiSmmIoTrapDispatch2ProtocolGuid
 58E26F0D-CBAC-4BBA-B70F-18221415665A,VirtioRngDxe
 58E6ED63-1694-440B-9388-E98FED6B65AF,EfiSocketProtocolGuid
-58E8A611-AB19-47DC-9850-3985DE8DF1FD,gPsmiMapHobGuid
+58E8A611-AB19-47DC-9850-3985DE8DF1FD,PsmiMapHobGuid
 5917EF16-F723-4BB9-A64B-D8C532F4D8B5,EfiUserCredentialClassHandprintGuid
 591F64F9-1CB8-4029-8868-F5A2C0CF3600,I2cMmioDeviceDxe
 59242DD8-E7CF-4979-B60E-A6067E2A185F,LegacyRegion
 59287178-59B2-49CA-BC63-532B12EA2C53,PchSmbusSmm
 59324945-EC44-4C0D-B1CD-9DB139DF070C,EfiIScsiInitiatorNameProtocolGuid
 5959E027-BAB0-4342-AA4B-8F73F017B485,OemRuntimeFunction
-595A6EDC-6D2C-474A-9082-3B992851DFFE,gOemCapsuleGuid
+595A6EDC-6D2C-474A-9082-3B992851DFFE,OemCapsuleGuid
 597F29A1-F354-4FBB-AFF4-BCBDA6A87C2C,LpcFlashPeiLibNull
 59ADD62D-A1C0-44C5-A90F-A1168770468C,PlatformInit
 59AF16B0-661D-4865-A381-38DE68385D8D,OpalSecurity
@@ -1396,7 +1395,7 @@
 5B51FEF7-C79D-4434-8F1B-AA62DE3E2C64,EfiDMArGenericErrorSectionGuid
 5B60CCFD-1011-4BCF-B7D1-BB99CA96A603,FatPei
 5B6DAB96-195D-4D24-9727-A7D0E93665C6,IconSD
-5B85965C-455D-4CC6-9C4C-7F086967D2B0,gPKeyFileSha256Guid
+5B85965C-455D-4CC6-9C4C-7F086967D2B0,PKeyFileSha256Guid
 5B94E419-C795-414D-A0D4-B80A877BE5FE,FspSecCoreT
 5BAB88BA-E0E2-4674-B6AD-B812F6881CD6,DxeVlvPlatformPolicyGuid
 5BAD89FF-B7E6-42C9-814A-CF2485D6E98A,EfiEventNotificationTypeNmiGuid
@@ -1417,11 +1416,11 @@
 5C98DE6E-CB69-465F-B6B9-F661E26E6F9D,LibGdtoa
 5CAC0099-0DC9-48E5-8068-BB95F5400A9F,RecoveryOnDataCdGuid
 5CB5C776-60D5-45EE-883C-452708CD743F,EfiLoadPeImageProtocolGuid
-5CBEF321-9B75-3120-88CD-5D123412CBCD,GUID_DRVR_ATIPwrXSmi
+5CBEF321-9B75-3120-88CD-5D123412CBCD,ATIPwrXSmi
 5CDDFAF3-E9A7-4D16-BDCE-1E002DF475BB,UefiDebugLibConOut
 5CDEEC47-2538-11E7-A438-B8E8562CBAFA,AppleVoiceOver
 5CEA02C9-4D07-69D3-269F-4496FBE096F9,EfiPersistentVirtualDiskGuid
-5CF308B5-FA23-4100-8A76-F326C2814880,gAmiMeasureCPUMicrocodeGuid
+5CF308B5-FA23-4100-8A76-F326C2814880,AmiMeasureCPUMicrocodeGuid
 5CF32E0B-8EDF-2E44-9CDA-93205E99EC1C,EmuThunkProtocolGuid
 5CF32E68-7660-449B-80E6-7EA36E03F6A8,EfiUserCredentialClassUnknownGuid
 5D1F3F9E-8CEE-4299-93C2-4C64EBB58977,GetServByName
@@ -1432,10 +1431,10 @@
 5DC03827-C9CB-4C83-B15F-6EAFBF86476C,AppleUartDxe
 5DEF82D2-6ED7-47DE-B0AC-11E55BAFFB05,LpcFlashLibNull
 5DF9946D-8170-4FB5-854F-A98865F9878F,gear5
-5E3848D4-0DB5-4FC0-9729-3F353D4F879F,gEfiLegacySpiSmmFlashProtocolGuid
+5E3848D4-0DB5-4FC0-9729-3F353D4F879F,EfiLegacySpiSmmFlashProtocolGuid
 5E523CB4-D397-4986-87BD-A6DD8B22F455,AtaAtapiPassThruDxe
 5E559C23-1FAA-4AE1-8D4A-C6CF026C766F,FirmwareIdGuid
-5E90A50D-6955-4A49-9032-DA3812F8E8E5,gAmiSmbiosProtocolGuid
+5E90A50D-6955-4A49-9032-DA3812F8E8E5,AmiSmbiosProtocolGuid
 5E93C847-456D-40B3-A6B4-78B0C9CF7F20,EfiEapManagement2ProtocolGuid
 5E948FE3-26D3-42B5-AF17-610287188DEC,EfiDiskInfoIdeInterfaceGuid
 5E975522-176F-4E2D-BB25-64ADCC7792A4,BaseDebugDeviceLibNull
@@ -1443,23 +1442,23 @@
 5EC9DF0F-9FB9-4CD5-9BAE-12872F032A6A,PeiIpmiUsb
 5F03BA33-8C6B-4C24-AA2E-14A2657BD454,EfiUserCredentialClassSmartCardGuid
 5F05B20F-4A56-C231-FA0B-A7B1F110041D,EfiRegexSyntaxTypePosixExtendedGuid
-5F171F5F-8385-4086-A69B-1FCF06AE4A3D,gAmiOsPpiConfirmationOverrideGuid
+5F171F5F-8385-4086-A69B-1FCF06AE4A3D,AmiOsPpiConfirmationOverrideGuid
 5F1B0D5B-DB44-4B81-A69D-553C591AF092,OCMR_DXE
 5F439A0B-45D8-4682-A4F4-F0576B513441,EfiSmmCpuIoGuid
 5F4735F7-DCF9-40FD-8858-026F931942A9,DxeIchInit
 5F5F605D-1583-4A2D-A6B2-EB12DAB4A2B6,ShellBcfgHiiGuid
-5F65DFDB-AC20-4F43-9B21-269E81A0EA7E,gPdmWindowButtonGuid
+5F65DFDB-AC20-4F43-9B21-269E81A0EA7E,PdmWindowButtonGuid
 5F6A843E-D188-41A3-BA3C-A83D8997DC7F,BootPriority
-5F7CE43D-565A-4420-B4F8-22ECA7245755,gAmiDbrFileGuid
-5F7D4E0E-3D6D-42BC-A942-0E91E83E3C31,gEfiPeiTcgLogHobGuid
+5F7CE43D-565A-4420-B4F8-22ECA7245755,AmiDbrFileGuid
+5F7D4E0E-3D6D-42BC-A942-0E91E83E3C31,EfiPeiTcgLogHobGuid
 5F82BC22-85E1-489D-93A1-42BBD664B434,IioCfgUpdateDxeLightningRidgeEXECB1
-5F864C8D-F2AE-4221-B8CA-F64ECFB0ACA7,GUID_PEIM_OemDebug
-5F87BA17-957D-433D-9E15-C0E7C8798899,gAmiDigitalSignatureProtocolGuid
-5FAC7360-D4F2-4C9E-A7ED-F2595E670889,gSctIsaHcProtocolGuid
+5F864C8D-F2AE-4221-B8CA-F64ECFB0ACA7,OemDebug
+5F87BA17-957D-433D-9E15-C0E7C8798899,AmiDigitalSignatureProtocolGuid
+5FAC7360-D4F2-4C9E-A7ED-F2595E670889,SctIsaHcProtocolGuid
 5FAD2389-2BC7-4BD2-83D3-429FB6AEA33F,EfiSerialPortTokenSpaceGuid
 5FB81FA3-BF65-43AD-A47B-DF70C3112B5A,SvSmmHandler
 5FCEA791-516E-4B61-892C-7229D4FF23D4,Int15ActiveLFP
-5FD88B4C-B658-4650-B3CE-A59BB991BFD4,gIgdPanelConfigGuid
+5FD88B4C-B658-4650-B3CE-A59BB991BFD4,IgdPanelConfigGuid
 5FECEF6B-5FA4-4570-8163-0CF72A9C04C5,Ps2Main
 6010BEA0-A051-408D-9A6E-B744D468A05D,WinCapsuleUpdate
 602160C7-E080-4AFE-BE4A-BB5D9B87042D,AcpiTableDxe
@@ -1467,7 +1466,7 @@
 6048B8EC-6D17-45C0-9BCF-63D164B41AB3,LanRom
 605CED2C-583B-4171-9311-AA6E146B1A4B,I2cPortA0Pio
 605EA650-C65C-42E1-BA80-91A52AB618C6,EfiEndOfPeiSignalPpiGuid
-6069277B-246B-45D5-BD6D-81820E10C11F,file_CommonSmiCallBack
+6069277B-246B-45D5-BD6D-81820E10C11F,CommonSmiCallBack
 60740CF3-D428-4500-80E6-04A5798241ED,HstiIhvProviderDxe
 6074610C-93C6-4A50-9AAA-0927DE7C6975,FirewireDeviceDxe
 60798953-1E91-46C9-B521-316623424522,WheaErrorLog
@@ -1475,7 +1474,7 @@
 60812E8C-505B-4D3E-A5B7-1715656CE362,ProjectDxeDriver
 60A14F6F-55B9-47A3-B067-01A93027F3FE,AppleMemoryTest
 60AC3A8F-4D66-4CD4-895A-C3F06E6665EE,iFfsAcpiTables
-60B27E1A-D65E-4DB0-B2BB-C16FA71E44AB,gPdmWindowSpinGuid
+60B27E1A-D65E-4DB0-B2BB-C16FA71E44AB,PdmWindowSpinGuid
 60B5E939-0FCF-4227-BA83-6BBED45BC0E3,EfiBootStateGuid
 60EC7720-512B-4490-9FD1-A336769AE01F,SmmControlPei
 60FABA47-419B-4E50-85C7-20E86AEE00FC,ASRockNetTcpWrapper
@@ -1492,16 +1491,16 @@
 61EC04FC-48E6-D813-25C9-8DAA44750B12,EfiPlatformMemory2ErrorSectionGuid
 61ED3D94-30D8-408C-97DF-DEDF2740F630,AmtLockPbtn
 621734D8-8B5E-4C01-B330-9F89A1081710,PlatformHookLibSerialPortPpi
-62331B78-D8D0-4C8C-8CCB-D27DFE32DB9B,gEfiLegacySpiSmmControllerProtocolGuid
+62331B78-D8D0-4C8C-8CCB-D27DFE32DB9B,EfiLegacySpiSmmControllerProtocolGuid
 62408AD5-4EAC-432B-AB9B-C4B85BFAED02,DxeIpmiLibIpmiProtocol
 627EE2DA-3BF9-439B-929F-2E0E6E9DBA62,BootScriptSmmPrivateDataGuid
 628A497D-2BF6-4264-8741-069DBD3399D6,ConSplitter
 62960CF3-40FF-4263-A77C-DFDEBD191B4B,EfiBluetoothConfigProtocolGuid
 6298FE18-D5EF-42B7-BB0C-2953283F5704,SleepSmi
 62C1E22F-BF7A-462E-A037-BF97BBC3ADF9,EzConfigDxe
-62CEEF5A-1D7C-4943-9B3A-95E2494C8990,gEmul6064KbdInputProtocolGuid
+62CEEF5A-1D7C-4943-9B3A-95E2494C8990,Emul6064KbdInputProtocolGuid
 62D171CB-78CD-4480-8678-C6A2A797A8DE,CpuInitDxe
-62DA6A56-13FB-485A-A8DA-A3DD7912CB6B,gAmiResetSystemEventGuid
+62DA6A56-13FB-485A-A8DA-A3DD7912CB6B,AmiResetSystemEventGuid
 62DC08AC-A651-4EE9-AF81-EAA9261E9780,S3NvramSave
 62E135CA-88C1-4F15-93E1-01193B3499F4,ASiXUsbEthernet
 62FC1B9A-8851-4654-90AD-CEA8C07FE259,IchSpi
@@ -1510,7 +1509,7 @@
 630AEB10-2106-4234-9DB3-836A3663F50D,BaseCacheAsRamLibNull
 63296C52-01CF-4EEA-A47C-782A14DA6894,SmramSaveInfoHandlerSmm
 632D5625-B73D-43B8-AF30-8D225D96168E,BasePalLibNull
-633194BE-1697-11E1-B5F0-2CB24824019B,gAmiPeiEndOfMemDetectGuid
+633194BE-1697-11E1-B5F0-2CB24824019B,AmiPeiEndOfMemDetectGuid
 6339D487-26BA-424B-9A5D-687E25D740BC,Tcg2ConfigFormSetGuid
 634E8DB5-C432-43BE-A653-9CA2922CC458,Nvme
 6372357A-06D7-43EF-B55C-1964F3DD6916,DxeIpmiBmcInitialize
@@ -1542,15 +1541,15 @@
 64A11188-5B86-4F59-A702-73365896E65E,AcpiVTD
 64A892DC-5561-4536-92C7-799BFC183355,EfiIsaAcpiProtocolGuid
 64AAEAE0-92DF-4980-8668-6EB5EAAF4393,FvInfoPei
-64C96700-6B4C-480C-A3E1-B8BDE8F602B2,gAmiPeiAfterMrcGuid
+64C96700-6B4C-480C-A3E1-B8BDE8F602B2,AmiPeiAfterMrcGuid
 650DFE73-6AC8-45E6-9215-9872BEC8B276,ICCDXE
-65289AE5-1589-484C-A610-90E10AC2DB28,gSiSaPolicyPpiGuid
+65289AE5-1589-484C-A610-90E10AC2DB28,SiSaPolicyPpiGuid
 652B38A9-77F4-453F-89D5-E7BDC352FC53,PeiUsbHostControllerPpiGuid
 654FE61A-2EDA-4749-A76A-56ED7ADE1CBE,CmosPei
 65530BC7-A359-410F-B010-5AADC7EC2B62,EfiTcp4ProtocolGuid
 655E4C19-9D7B-4491-AD10-A49FF355C00A,FastBootOptionBds
 6568A3D6-015F-4B4A-9C89-1D146314130A,EfiSmmBaseThunkCommunicationGuid
-6572045F-B1BF-458E-BC02-706762C609AE,gEfiHeciSmmRuntimeProtocolGuid
+6572045F-B1BF-458E-BC02-706762C609AE,EfiHeciSmmRuntimeProtocolGuid
 65A18235-5096-4032-8C63-214F0249CE8D,BaseMemoryLibSse2
 65E5746E-9C14-467D-B5B3-932A66D59F79,XhciPei
 6653876C-F6A1-45BB-A027-20455093BC6D,SecPeiFspPlatformSecLibVlv2
@@ -1560,7 +1559,7 @@
 667A8B1C-9C97-4B2A-AE7E-568772FE45F3,BaseResetSystemLibNull
 667DD791-C6B3-4C27-8A6B-0F8E722DEB41,EfiEventNotificationTypeDmarGuid
 6683D10C-CF6E-4914-B5B4-AB8ED7370ED7,AmiValidBootImageCertTblGuid
-6684D675-EE06-49B2-876F-79C58FDDA5B7,gIrmtAcpiTableStorageGuid
+6684D675-EE06-49B2-876F-79C58FDDA5B7,IrmtAcpiTableStorageGuid
 668706B2-BCFC-4AD4-A185-75E79F3FE169,NvmeDynamicSetup
 669346EF-FDAD-4AEB-08A6-21462D3FEF7D,PerformancePkgTokenSpaceGuid
 6695974D-968C-420B-80B9-7870CD20118F,PlatformSecLibNull
@@ -1570,18 +1569,18 @@
 66DE8584-DE01-4BAB-B5D0-8B99594372FC,IchUhciPei
 66ED4721-3C98-4D3E-81E3-D03DD39A7254,EfiUdp6ServiceBindingProtocolGuid
 6707536E-46AF-42D3-8F6C-15F2F202C234,MXMdat
-67269263-0AF1-45DD-93C8-299921D0E1E9,gSmbiosUpdateDataProtocolGuid
+67269263-0AF1-45DD-93C8-299921D0E1E9,SmbiosUpdateDataProtocolGuid
 672A0C68-2BF0-46F9-93C3-C4E7DC0FA555,UsbCredentialProvider
-6737F69B-B8CC-45BC-9327-CCF5EEF70CDE,gAmiPlatformIdeProtocolGuid
+6737F69B-B8CC-45BC-9327-CCF5EEF70CDE,AmiPlatformIdeProtocolGuid
 67439E94-FD37-4A32-BD53-3B97386432E4,Ahci
 67451698-1825-4AC5-999D-F350CC7D5D72,CryptoPPI
 6776572C-FE56-42CA-9B93-3D0960E7583A,IconBrokenBoot
 67791E00-0C05-4AE7-A921-FC4057221653,TxtOneTouchDxe
 67820532-7613-4DD3-9ED7-3D9BE3A7DA63,Aint13
-67A54A24-3F4F-4048-8787-3E5AA2A0B7D2,file_SAPolicy
+67A54A24-3F4F-4048-8787-3E5AA2A0B7D2,SAPolicy
 67AC0B1E-54C2-41A6-B57E-C2A321416ABC,ActiveBios2
 67B495CF-17CE-424B-9633-49773AE63908,UsbWorkaroundDxe
-67BC3883-7E79-4BC1-A33E-3AF7D17589BA,gAmiHddPowerMgmtProtocolGuid
+67BC3883-7E79-4BC1-A33E-3AF7D17589BA,AmiHddPowerMgmtProtocolGuid
 67C4F112-3385-4E55-9C5B-C05B717C4228,EfiSmmSwapAddressRangeProtocolGuid
 67C53648-DA56-4726-AE21-FBA4D04686B3,RsdpPlus
 67C63A11-F89D-4500-8270-D9DB251EB2AF,Ps2KeyboardPei
@@ -1601,19 +1600,19 @@
 6895F6F0-8879-45B8-A9D9-9639E532319E,UhciPeiUsb
 689CDA29-29A8-42F6-93FC-46BA5F180651,ImagePasswordProceed
 689E4C62-70BF-4CF3-88BB-33B318268670,EfiBlockIoCryptoAlgoAesCbcMsBitlockerGuid
-68B81E51-2583-4582-95DB-C5723236C4F1,gNonSmmEmul6064TrapProtocolGuid
+68B81E51-2583-4582-95DB-C5723236C4F1,NonSmmEmul6064TrapProtocolGuid
 68D076CD-D8F3-409B-987F-1012CDB88242,SlotDataUpdateDxeLightningRidgeEXECB4
 68D89864-C0A8-490D-BE18-C83D67240928,SmbiosDataUpdateDxeNeonCityFPGA
 6903A447-CB4F-45F6-89A2-7E7E2F9EE14C,InstallMsdm
 69282DF3-778F-4269-91AA-D7DF6E193317,Uc2OnUcThunk
-6950AFFF-6EE3-11DD-AD8B-0800200C9A66,GUID_DRVR_AmdAgesaDxeDriv
+6950AFFF-6EE3-11DD-AD8B-0800200C9A66,AmdAgesaDxeDriv
 695BEC93-82AE-4C17-BDAD-7F184F4E651D,LibC
 695D8AA1-42EE-4C46-805C-6EA6BCE799E3,EfiPeiVirtualBlockIoPpiGuid
 69735520-DA83-444A-93DC-BDDD59E59182,Heci3Smm
-697CFA95-B1F2-4ED7-A0D2-7AC6E47B3C99,file_SwitchableGraphicsDxe
+697CFA95-B1F2-4ED7-A0D2-7AC6E47B3C99,SwitchableGraphicsDxe
 697D81A2-CF18-4DC0-9E0D-06113B618A3F,EfiExtendedSalMpServicesProtocolGuid
 6987936E-ED34-44DB-AE97-1FA5E4ED2116,HelloWorld
-699ADD70-8554-4993-83F6-D2CDC081DD85,gSerialCapsuleGuid
+699ADD70-8554-4993-83F6-D2CDC081DD85,SerialCapsuleGuid
 69A79759-1373-4367-A6C4-C7F59EFD986E,FspReservedMemoryResourceHobGuid
 69D13BF0-AF91-4D96-AA9F-2184C5CE3BC0,PlatformModuleTokenSpaceGuid
 69E1A19F-BC8C-4021-B3D9-E0B2545092C6,OC_Tuner
@@ -1665,7 +1664,7 @@
 6D6963AB-906D-4A65-A7CA-BD40E5D6AF2B,Udp4Dxe
 6D6963AB-906D-4A65-A7CA-BD40E5D6AF4D,Tcp4Dxe
 6D86FB36-BA90-472C-B583-3FBED3FB209A,FspHobGuid
-6D9BF711-A90D-42F9-A3FB-DD08B6E89037,gSLP20EncryptedOEMPublicKeyVariableGuid
+6D9BF711-A90D-42F9-A3FB-DD08B6E89037,SLP20EncryptedOEMPublicKeyVariableGuid
 6DA670E8-3D73-4EB2-A721-A2DDF682FDD8,Tpm12MeasureConfigurationInfoFuncGuid
 6DADA47D-645A-4128-B292-57A475E1456A,AppleSecureBootDxe
 6DADF1D1-D4CC-4910-BB6E-82B1FD80FF3D,EfiSmmPeiSmramMemoryReserveGuid
@@ -1685,37 +1684,37 @@
 6E72A82C-14A5-4F02-A377-4A423BB1817F,WindowsNameLabel
 6E851687-A7A9-4AA2-8DD0-673E03E51433,SetSockOpt
 6E9A4C69-57C6-4FCD-B083-4F2C3BDB6051,FdtPlatformDxe
-6EA0F71C-614A-437E-8F49-243AD4E83268,gEmul6064TrapProtocolGuid
+6EA0F71C-614A-437E-8F49-243AD4E83268,Emul6064TrapProtocolGuid
 6EB44D26-1D39-4FEB-A993-4DAAFB5F8D85,HybridDriver
 6ECD1463-4A4A-461B-AF5F-5A33E3B2162B,EfiPeiGraphicsPpiGuid
 6ECEFFFD-614D-452E-A81D-25E56B0DEF98,BatteryState0
 6ECFCE51-5724-450C-A38A-58553E954422,SmmAccessPeim
-6EE1B483-A9B8-4EAF-9AE1-3B28C5CFF36B,gSkipTpmStartupGuid
+6EE1B483-A9B8-4EAF-9AE1-3B28C5CFF36B,SkipTpmStartupGuid
 6EEDE20E-8F32-4FE2-BEB7-7A00F3CCDBC3,OpromUpdateDxeLightningRidgeEXRP
 6EFAC84F-0AB0-4747-81BE-855562590449,XenIoProtocolGuid
 6F0198AA-1F1D-426D-AE3E-39AB633FCC28,Cf9ResetDxe
 6F0CF054-AE6A-418C-A7CE-3C7A7CD74EC0,LogoPcx
 6F1B1FA2-561D-47C3-A22D-DBDC21246D8F,TrustedChannelSmm
 6F20F7C8-E5EF-4F21-8D19-EDC5F0C496AE,MemInfoProtocolGuid
-6F2C06A8-D4B4-4A93-9F78-2B480BE80E0F,gEfiSmiFlashProtocolGuid
+6F2C06A8-D4B4-4A93-9F78-2B480BE80E0F,EfiSmiFlashProtocolGuid
 6F71926E-60CE-428D-AA58-A3D9FB879429,IfConfig6
 6F871ADD-9D86-4676-8BAD-68E2E451FC5B,MicrocodeFlashAccessLibNull
 6F8C2B35-FEF4-448D-8256-E11B19D61077,EfiSecPlatformInformationPpiGuid
 6F92E393-03C0-427B-BBEB-4EF807B55BD8,IconNetworkRecovery
-6FC01D84-46C5-4E83-91B7-FD8FBABD7B12,GUID_PEIM_BiosInfo
-6FCE3BB9-9742-4CFD-8E9E-39F98DCA3271,gAmiPciSmmHandoffProtocolGuid
+6FC01D84-46C5-4E83-91B7-FD8FBABD7B12,BiosInfo
+6FCE3BB9-9742-4CFD-8E9E-39F98DCA3271,AmiPciSmmHandoffProtocolGuid
 6FD1DCC5-B5B9-4A82-8728-8D854428A4A3,DxeFfsGfxDriver
 6FD5B00C-D426-4283-9887-6CF5CF1CB1FE,EfiUserManagerProtocolGuid
-6FDE3AF8-37AD-43FC-B728-F4D341F39240,gPhoenixSmmWatchdogTimerProtocolGuid
+6FDE3AF8-37AD-43FC-B728-F4D341F39240,PhoenixSmmWatchdogTimerProtocolGuid
 6FE38843-6500-42C2-A535-7769DEA56AA4,FpgaLoaderPeim
 6FF23F1D-877C-4B1B-93FC-F142B2EEA6A7,EfiGopDisplayBrightnessProtocolGuid
 6FF479F5-6120-4A41-A8C9-D9500F7DF594,Mdot2Driver
-6FFEC78D-7DBF-4F8B-968D-2F43A080C13F,gPhoenixDesktopWindowProtocolGuid
+6FFEC78D-7DBF-4F8B-968D-2F43A080C13F,PhoenixDesktopWindowProtocolGuid
 70101EAF-0085-440C-B356-8EE36FEF24F0,EfiLegacyRegion2ProtocolGuid
-70232FB4-81F4-49F6-AA05-51D99EBDC352,file_PciPlatform
-7030AB02-B04D-4ABE-8801-20201D0C566A,GUID_DRVR_ASUSFancyStart
+70232FB4-81F4-49F6-AA05-51D99EBDC352,PciPlatform
+7030AB02-B04D-4ABE-8801-20201D0C566A,ASUSFancyStart
 704EA695-F373-42D4-BF1B-44BB7F60C295,menu_bottom_left
-704EBEA2-5EE6-4898-9659-018B74B44789,gEfiSeCOperationProtocolGuid
+704EBEA2-5EE6-4898-9659-018B74B44789,EfiSeCOperationProtocolGuid
 7064F130-846E-4CE2-83C1-4BBCBCBF1AE5,AppleBootPolicy
 7076876E-80C2-4EE6-AAD2-28B349A6865B,EfiCertX509Sha384Guid
 707BE83E-0BF6-40A5-BE64-34C03AA0B8E2,EfiSmbusArpMapGuid
@@ -1724,25 +1723,25 @@
 70A4D159-1F01-4203-A598-7C2794151CE6,EfiOsBootOptionNames
 70AEBF01-9EA0-48D8-AE17-3A184B12DBFE,TseDefaultBootOrder
 70B221AF-FDFF-4FDE-9968-1AF623A956D9,EfiI2cHostProtocolGuid
-70D57D67-7F05-494D-A014-B75D7345B700,file_StorageSecurityCommand
+70D57D67-7F05-494D-A014-B75D7345B700,StorageSecurityCommand
 70E1A818-0BE1-4449-BFD4-9EF68C7F02A8,ReFlash
 70E56C5E-280C-44B0-A497-09681ABC375E,DmiDataGuid
-70EEECBE-727A-4244-904C-DB6BF0055392,gEfiEcAccessProtocolGuid
+70EEECBE-727A-4244-904C-DB6BF0055392,EfiEcAccessProtocolGuid
 70F64793-C323-4261-AC2C-D876F27C5345,EfiKmsFormatGeneric256Guid
 70FB9CE0-2CB1-4FD7-80EE-AB4B6CF4B43F,GetHostByName
-70FFF0FF-A543-45B9-8BE3-1BDB90412080,gTcgInternalflagGuid
+70FFF0FF-A543-45B9-8BE3-1BDB90412080,TcgInternalflagGuid
 710E415A-6A5B-4AEA-973F-6DD3F9CB0056,PLEDPEI
-71148D39-5926-4022-91AC-CB252AF74530,GUID_APPN_ASUSEZFlash
+71148D39-5926-4022-91AC-CB252AF74530,ASUSEZFlash
 711C703F-C285-4B10-A3B0-36ECBD3C8BE2,EfiCapsuleVendorGuid
-711E7D64-1131-494B-A2D1-84806CD72D53,gEfiTcgTreeLogHobGuid
-71202EEE-5F53-40D9-AB3D-9E0C26D96657,gAmiTseSetupEnterGuid
+711E7D64-1131-494B-A2D1-84806CD72D53,EfiTcgTreeLogHobGuid
+71202EEE-5F53-40D9-AB3D-9E0C26D96657,AmiTseSetupEnterGuid
 71298B1B-26AA-44D8-87CD-91A087C3481A,SmbiosDataUpdateDxeLightningRidgeEXECB3
 714845FE-F8B8-4B45-9AAE-708ECDDFCB77,ExFatDxe
 716EF0D9-FF83-4F69-81E9-518BD39A8E70,EfiSdMmcPassThruProtocolGuid
 71761D37-32B2-45CD-A7D0-B0FEDD93E8CF,EfiDirectedIoDMArErrorSectionGuid
 717886AB-C40A-44CF-9114-4119E84B0DC7,PciCfgOnPciCfg2Thunk
-71A8917B-0891-4E27-8A73-A9B334840393,gAmiPeiBeforeMrcGuid
-71C4C155-D54B-4D59-A2C1-F9A5723C65A8,gEfiIsPlatformSupportWheaProtocolGuid
+71A8917B-0891-4E27-8A73-A9B334840393,AmiPeiBeforeMrcGuid
+71C4C155-D54B-4D59-A2C1-F9A5723C65A8,EfiIsPlatformSupportWheaProtocolGuid
 71E218BA-0F3F-46B6-A42E-93A2C1195A31,AmdRadeonDriver
 71ED12D1-250B-42FB-8C17-10DCFA771701,LegacyInterrupt
 71EE5E94-65B9-45D5-821A-3A4D86CFE6BE,EfiUserCredentialProtocolGuid
@@ -1767,8 +1766,8 @@
 7385DBBE-8050-4FAF-8B64-4C386E1FAA88,CodeAccessCheckS3Pei
 738A9314-82C1-4592-8FF7-C1BDF1B20ED4,ShellTftpHiiGuid
 738C6917-71F0-4D45-AB68-91744136AEEA,AppleIpAgent
-73905351-EB4D-4637-A83B-D1BF6C1C48EB,gTSEInvalidateBgrtStatusProtocolGuid
-73995A5C-C2AB-48CC-A404-E39B38505C56,gPlatformRecoveryOrderGuid
+73905351-EB4D-4637-A83B-D1BF6C1C48EB,TSEInvalidateBgrtStatusProtocolGuid
+73995A5C-C2AB-48CC-A404-E39B38505C56,PlatformRecoveryOrderGuid
 739C2226-3264-4454-991C-8DC44A73D6AF,ProjectPeiDriver
 73ADAAC0-9857-4D74-B0D7-EC6094882D99,BaseTraceHubDebugLibNull
 73E6F6B4-D029-4E87-8405-6067C8BD02A6,UsbPei
@@ -1780,7 +1779,7 @@
 74346897-9E0C-4B41-BF1F-BAA1ECB85DA6,IioCfgUpdateDxeLightningRidgeEXRP
 744C9DBD-74DE-424D-AB59-AA398305871F,EDIDParserDriver
 7462660F-1CBD-48DA-AD11-91717913831C,EfiPciOptionRomTableGuid
-7465BA75-88A7-4B61-9A7E-6D4EDF6804DC,gAmiUdfMediaGuid
+7465BA75-88A7-4B61-9A7E-6D4EDF6804DC,AmiUdfMediaGuid
 7474A4C6-7F30-4DE1-BC68-DA5EFE615B52,SmbiosDataUpdateDxeNeonCityEPRP
 748221BC-2BA9-1545-8AA9-A03A8591999E,AppleNetVolume
 7497B957-20C3-4E47-A2C0-594966FD28FD,UefiDriverPolicyDXE
@@ -1795,23 +1794,23 @@
 753630C9-FAE5-47A9-BBBF-88D621CD7282,SmmChildDispatcher
 754AAF56-099B-440D-8DCD-626F4E2C52F4,RsaIScsiSupport
 755877A6-4F10-4A5C-9B2E-852123B9682C,FlashSmiDxe
-755B6596-6896-4BA3-B3DD-1C629FD1EA88,gAmiFlashProtocolGuid
-7576CC89-8FA3-4CAD-BA02-6119B46ED44A,gAmiSioSmmHandoffProtocolGuid
-7578B307-B25B-44F9-892E-209B0E3993C6,gEmul6064MsInputProtocolGuid
+755B6596-6896-4BA3-B3DD-1C629FD1EA88,AmiFlashProtocolGuid
+7576CC89-8FA3-4CAD-BA02-6119B46ED44A,AmiSioSmmHandoffProtocolGuid
+7578B307-B25B-44F9-892E-209B0E3993C6,Emul6064MsInputProtocolGuid
 7585C771-3CE4-41FE-B780-845CD85BA444,FirmwarePassword
-75B0886E-CD6A-469F-AE0B-8CED9033D199,gEfiBpdtLibBp2DataGuid
-75CA7C9D-502E-468A-9AAF-7F2A29E6DBCF,gAmiSbHddPolicyProtocolGuid
+75B0886E-CD6A-469F-AE0B-8CED9033D199,EfiBpdtLibBp2DataGuid
+75CA7C9D-502E-468A-9AAF-7F2A29E6DBCF,AmiSbHddPolicyProtocolGuid
 75FBCDBA-28C4-455A-A71D-536C9AB65093,SmcSetupModify
 760F874E-B8CB-405E-AA32-A46AE2F3D680,VariableDefaultUpdate
 7671D9D0-53DB-4173-AA69-2327F21F0BC7,EfiAuthenticationInfoProtocolGuid
-768007EF-E607-4417-8F5D-BCFE16DAE336,gSmbusConfigGuid
+768007EF-E607-4417-8F5D-BCFE16DAE336,SmbusConfigGuid
 768BEDFD-7B4B-4C9F-B2FF-6377E3387243,NTFS
 76A7B4FC-C8D5-462D-A4D2-6E88338A772A,PlatformCpuPolicy
 76B6BDFA-2ACD-4462-9E3F-CB58C969D937,PerformanceProtocolGuid
 76D5CF91-0C55-434E-97C2-D2825C82E610,OemActivation
 76F3992D-529E-4EFE-8BBE-8E1ED432C223,AmiMeasurePciopromGuid
 76FDC1AE-A42A-416A-98E3-A2F29146DAC3,AppleDhcpProtocolDxe
-7701AA8F-27EB-4562-8C59-4731CAA24E7C,gScPmcFunctionDisableResetHobGuid
+7701AA8F-27EB-4562-8C59-4731CAA24E7C,ScPmcFunctionDisableResetHobGuid
 7701D7E5-7D1D-4432-A468-673DAB8ADE60,LdrMemoryDescriptorGuid
 77148690-7E43-4673-AFAE-34532CDD4248,SmmControlDxe
 772484B2-7482-4B91-9F9A-AD43F81C5881,EfiMiscSubClassGuid
@@ -1830,7 +1829,7 @@
 78092548-48CF-449B-9BDB-F63849856460,AmiProtocolInternalHlxeGuid
 78097BB6-48CF-449B-9BDB-F63849856460,mAmiPpiInternalVarGuid
 78247C57-63DB-4708-99C2-A8B4A9A61F6B,EfiMtftp4ProtocolGuid
-78270D5E-9450-4FAE-8818-B91EA39864CD,file_ChipsetLibServicesSmm
+78270D5E-9450-4FAE-8818-B91EA39864CD,ChipsetLibServicesSmm
 7827D4B0-926E-48F9-8ABD-69816EF86D16,AppleDmgBootDxe
 7833616E-AE0D-594F-870C-80E68682D587,ThunkProtocolList
 783658A3-4172-4421-A299-E009079C0CB4,EfiLegacyBiosPlatformProtocolGuid
@@ -1850,7 +1849,7 @@
 7914C493-F439-4C6C-AB23-7F72150E72D4,ImageAppleLogo
 79263F9A-1701-4382-98C2-573F3558E6C8,PlatformFvbLibNull
 7942EDD0-C023-4357-93ED-F6626D711E9E,PeiIpmiBmcInitialize
-794B23CB-ECCE-497F-A14D-96E1AFCB00E3,gNPKReserveMemGuid
+794B23CB-ECCE-497F-A14D-96E1AFCB00E3,NPKReserveMemGuid
 795231E2-A205-4B8D-8C8D-7353B713DF7D,efi_pop_mid_pressed
 798E722E-15B2-4E13-8AE9-6BA30FF7F167,IntelSmbiosDataHobGuid
 79971BCB-D5C6-4D5A-9C24-BCA46C2ADBBE,BdsDriverProxy
@@ -1862,11 +1861,11 @@
 79CD78D8-6EDC-4978-BD02-3299C387AB17,StatusCodeHandlerSmm
 79DED328-7FCE-4909-9AFD-D66176AF97A6,OobRx
 79E4A61C-ED73-4312-94FE-E3E7563362A9,PrintDxe
-79E5F681-59F4-4415-8E46-8C223CF517E6,gEfiBootMediaHobGuid
-79FBAD19-F9E1-4D08-B7BC-358453195E41,gAmiTpmRollbackSmmProtocolGuid
+79E5F681-59F4-4415-8E46-8C223CF517E6,EfiBootMediaHobGuid
+79FBAD19-F9E1-4D08-B7BC-358453195E41,AmiTpmRollbackSmmProtocolGuid
 7A08CB98-E9BC-41C3-BE19-B302F3F1F595,Terminal
 7A1CC2C0-7AF6-4F68-A564-CC03558FC3C5,SuperMDxe
-7A28436A-E113-406A-AFF9-0DBF7F643E02,gEfiTcgPrivateInterfaceGuid
+7A28436A-E113-406A-AFF9-0DBF7F643E02,EfiTcgPrivateInterfaceGuid
 7A54B36F-F745-462C-B11F-16E03E52B617,AsusSpdTransfer
 7A59B29B-910B-4171-8242-A85A0DF25B5B,EfiHttpProtocolGuid
 7A5DBC75-5B2B-4E67-BDE1-D48EEE761562,EfiSmmSpiReadyProtocolGuid
@@ -1883,9 +1882,9 @@
 7AF77F94-4C38-4FF1-8CCD-3E084F2FFEC0,SkylakeGraphics
 7B2349E0-522D-4F8E-B927-69D97C9E795F,EfiPaddingRsassaPssGuid
 7B7B65B6-E350-4139-8FE4-665772D32A45,IhisiSmm
-7B7B65B6-E350-4139-8FE4-665772D32A47,file_Ihisi
+7B7B65B6-E350-4139-8FE4-665772D32A47,Ihisi
 7B8DB049-C7C7-4D3B-809F-926DEE47CCA2,SBSMI
-7B9A0A12-42F8-4D4C-82B6-32F0CA1953F4,gAmiBoardInfoFileGuid
+7B9A0A12-42F8-4D4C-82B6-32F0CA1953F4,AmiBoardInfoFileGuid
 7BAC95D3-0DDF-42F3-9E24-7C644940379A,BdsStringPackGuid
 7BAEC70B-57E0-4C76-8E87-2F9E28088343,EfiVT100PlusGuid
 7BB28B99-61BB-11D5-9A5D-0090273FC14D,Logo
@@ -1893,22 +1892,22 @@
 7C04A583-9E3E-4F1C-AD65-E05268D0B4D1,UefiShellFileGuid
 7C069ADA-DE4E-488C-B0FC-4F2E057D96D8,DUFontDriver
 7C29785C-66B9-49FC-B797-1CA5550EF283,PeiUsbIoPpiGuid
-7C79AC8C-5E6C-4E3D-BA6F-C260EE7C172E,file_SmmRuntime
+7C79AC8C-5E6C-4E3D-BA6F-C260EE7C172E,SmmRuntime
 7C81C66A-4F11-47AB-82D3-67C4D635AED1,LegacyMebxLaunch
 7C9E5A63-B987-435E-B17F-9E9CFA53F880,SmmPlatform
 7CA1024F-EB17-11E5-9DBA-28D2447C4829,TlsAuthConfigDxe
 7CC1567C-CCB8-4C50-80BA-D44A3B667415,AmdSb800_PeiInterfacePei
-7CC1667C-CCB8-4C50-80BA-D44A3B667415,GUID_PEIM_SbInterfacePei
+7CC1667C-CCB8-4C50-80BA-D44A3B667415,SbInterfacePei
 7CCB2D7E-CD15-417E-A5C8-003DA6325B9F,PowerStateManager
 7CE75114-8272-45AF-B536-761BD38852CE,Slp21PubKey
 7CE88FB3-4BD7-4679-87A8-A8D8DEE50D2B,EfiEventReadyToBootGuid
-7CEA4F7E-2052-46ED-BEFD-E22A44DC65E7,gTpm20HobGuid
+7CEA4F7E-2052-46ED-BEFD-E22A44DC65E7,Tpm20HobGuid
 7D019990-8CE1-46F5-A776-3C5198676AA0,EfiExtendedSalResetServicesProtocolGuid
 7D113AA9-6280-48C6-BACE-DFE7668E8307,AmiMpTpmBin
 7D17EF81-57C8-4210-957C-6FDAA8EA1DD6,PciHotPlugDxe
 7D24A234-A8C2-4718-BF60-A2EF070F414E,OpalPasswordSmm
 7D2BD134-500D-4F42-AEE2-26ACCFB6CB1D,LibStdio
-7D3DCEEE-CBCE-4EA7-8709-6E552F1EDBDE,FlagsStatusguid
+7D3DCEEE-CBCE-4EA7-8709-6E552F1EDBDE,FlaSStatusguid
 7D574D54-D364-4D4A-95E3-4945DB7AD3EE,ShellInstall1HiiGuid
 7D5FF0E3-2FB7-4E19-8419-44266CB60000,DP
 7D77B32E-BAB2-4CC7-8378-7550513F3FCA,UsbOcUpdateDxeLightningRidgeEXECB4
@@ -1916,14 +1915,14 @@
 7D916D80-5BB1-458C-A48F-E25FDD51EF94,EfiTtyTermGuid
 7D9DDBFB-FB67-4303-90B0-9A7A7FF29B57,OpromUpdateDxeLightningRidgeEXECB1
 7DADBC98-6489-4D1C-907A-8EE243AF805B,ASUS_EUPPEI
-7DC20199-DE28-4A91-A89C-FF06F237352C,file_PrePostHotkey
+7DC20199-DE28-4A91-A89C-FF06F237352C,PrePostHotkey
 7E0C6E3E-C80F-47D1-8ADA-554926B2B6B3,GenericMemoryTestDxe
 7E1F0D85-04FF-4BB2-866A-31A2996A48A8,EfiPeiFvFileLoaderPpiGuid
 7E374E25-8E01-4FEE-87F2-390C23C606CD,PlatformAcpiTable
 7E3D95E4-89F8-41B9-B788-5FB22D77F9A3,SmcNVDIMMDxeDriver
-7E4B2ACB-7391-408F-B143-3A0B07C6E165,gFdoModeEnabledHobGuid
+7E4B2ACB-7391-408F-B143-3A0B07C6E165,FdoModeEnabledHobGuid
 7E631AA5-AFCE-437B-81FA-FA34EA14B3C3,ExFatRecovery
-7E7369CE-0188-4183-8C2D-DAF7B730E42B,gAmiCmosBadHobGuid
+7E7369CE-0188-4183-8C2D-DAF7B730E42B,AmiCmosBadHobGuid
 7E97A470-EFDB-4D02-8FCE-6190D27BA296,EfiExtendedSalRtcServicesProtocolGuid
 7E983BCE-5C99-4BE0-B3D0-210E8FDDD3C0,VlanceDxe
 7EB7126D-C45E-4BD0-9357-7F507C5C9CF9,RomLayoutPei
@@ -1938,19 +1937,19 @@
 7F1647C8-B76E-44B2-A565-F70FF19CD19E,EfiDns6ServiceBindingProtocolGuid
 7F4158D3-074D-456D-8CB2-01F9C8F79DAA,EfiTpmDeviceSelectedGuid
 7F480A20-7A19-4764-A5CA-4E9B8AECAF1E,PchPciBus
-7F4A3A75-538C-4259-B420-C44818CBC553,GUID_DRVR_ATIPwrXDXE
-7F4F86F6-EBC9-4603-A4C2-C7CC8B4476DB,gHeci2BarSaveRestoreGuid
+7F4A3A75-538C-4259-B420-C44818CBC553,ATIPwrXDXE
+7F4F86F6-EBC9-4603-A4C2-C7CC8B4476DB,Heci2BarSaveRestoreGuid
 7F6E0A24-DBFD-43DF-9755-0292D7D3DD48,IsaFloppyPei
 7F8D35BD-0CE3-4654-B5D3-73FC4B38AABF,PlatformEarlyDxe
-7F955A3E-AFB5-4122-B925-4B1171F693F5,gAmiBlockIoWriteProtectionProtocolGuid
+7F955A3E-AFB5-4122-B925-4B1171F693F5,AmiBlockIoWriteProtectionProtocolGuid
 7FA68D82-10A4-4E71-9524-D3D9500D3CDF,PlatformSecureLibNull
 7FD082A9-3D6B-44E3-9C31-74D6B80F965C,SetupConfigUpdateDxeLightningRidgeEXECB1
 7FED72EE-0170-4814-9878-A8FB1864DFAF,SmmRelocateDxe
 7FFF52C8-82DE-4820-8960-5093102E484D,IncompatiblePciDevice
 80023209-6386-4C1D-909B-63506A2146FF,HWM_SetupDXE
 801ADCA0-815E-46A4-84F7-657F53621A57,SectionExtractionDxe
-801E9DEF-DDBB-4CA3-9698-C9158EB86AEA,gAmiPeriodicSmiControlProtocolGuid
-8041F38B-0A34-49D7-A905-03AEEF4826F7,gPlatformSsdtImageGuid
+801E9DEF-DDBB-4CA3-9698-C9158EB86AEA,AmiPeriodicSmiControlProtocolGuid
+8041F38B-0A34-49D7-A905-03AEEF4826F7,PlatformSsdtImageGuid
 805B032B-6A00-46F5-8501-CB88A21D5321,BcmDhd
 80897901-91F6-4EFE-9579-3353A0C02DAB,SDMediaDevice
 809FBBFD-127A-4249-88BC-FD0E767F4FFD,IconInternalHD
@@ -1988,7 +1987,7 @@
 83FA5AED-5171-4949-BDC9-0CBC9E123663,FwCapsuleRecoveryPPI
 8401A045-6F70-4505-8471-7015B40355E3,UsbBusPei
 8401A046-6F70-4505-8471-7015B40355E3,UsbBotPei
-8404B613-EA35-466F-BC7B-9F51C965198E,GUID_APPN_AsusBackDoorPW
+8404B613-EA35-466F-BC7B-9F51C965198E,AsusBackDoorPW
 842A454A-75E5-408B-8B1C-36420E4E3F21,NvramSmi
 8434DA1F-5CEB-402E-A93C-038CBE0F3F0E,SmmOemActivation
 843DC720-AB1E-42CB-9357-8A0078F3561B,EfiSmmControl2ProtocolGuid
@@ -1997,7 +1996,7 @@
 848377A0-A78D-469D-B766-87186AA6770D,EpuHwModeDxe
 8489334D-4219-4CA1-9B42-1D46B0B75861,TcgPpVendorLibNull
 848E908E-BD11-428E-94F9-7A0EEFCD37A6,BaseCsrToPcieLibNull
-84DA4361-EE8A-4769-9368-4F28A1C92032,gEfiBxtTokenSpaceGuid
+84DA4361-EE8A-4769-9368-4F28A1C92032,EfiBxtTokenSpaceGuid
 84DDA68C-CA5A-4C30-9261-DD6DE7E45A95,EzSetupPortingDxe
 84E7016D-1EB8-4637-B01E-9EED018C7AE0,BiosGuardNvs
 84FA65AF-21BC-43BE-85FF-8AA7E7832A1D,AmiPciExpressLibNull
@@ -2007,7 +2006,7 @@
 858031F3-96A2-406E-ABCC-ED264A3A31D6,CryptRuntimeDxe
 858EBE6F-360F-415B-B7DC-463AAEB03412,TcgLegacy
 85A084FA-6B0E-BD4C-A20E-156E46103155,Legacy8259
-85A6D3E6-B65B-4AFC-B38F-C6D54AF6DDC8,gEfiSpiConfigurationProtocolGuid
+85A6D3E6-B65B-4AFC-B38F-C6D54AF6DDC8,EfiSpiConfigurationProtocolGuid
 85A8AB57-0644-4110-850F-981322047070,EdkiiSmmLegacyBootProtocolGuid
 85B75607-F7CE-471E-B7E4-2AEA5F7232EE,EfiUserInfoAccessSetupAdminGuid
 8600C3A8-4213-456E-832A-D51E8E5F4AB1,AppleHeciDxe
@@ -2022,11 +2021,11 @@
 865A5AAB-B85D-474C-8455-65D1BE844BE2,EfiSourceLevelDebugPkgTokenSpaceGuid
 86787704-8FED-11E3-B3FF-F33B73ACFEC2,TcpFastbootTransportDxe
 86843F56-675D-40A5-9530-BC858372F103,OsSelectionVariableGuid
-86C29AA5-0DB0-4343-BD52-7A729F37C96D,gAmiDigitalSignaturePPIGuid
+86C29AA5-0DB0-4343-BD52-7A729F37C96D,AmiDigitalSignaturePPIGuid
 86C77A67-0B97-4633-A187-49104D0685C7,EfiFirmwareManagementProtocolGuid
 86CDDF93-4872-4597-8AF9-A35AE4D3725F,IScsiDxe
 86D70125-BAA3-4296-A62F-602BEBBB9081,DxeIplPei
-86F5680A-155C-4BC8-AC77-573848E2AD3D,gAmiTreePpiGuid
+86F5680A-155C-4BC8-AC77-573848E2AD3D,AmiTreePpiGuid
 86F61BDF-5BFD-46D3-B0F9-E43728DA1D2E,OCMR_CPU_POWER_MANAGEMENT_DXE
 870CAF91-B79B-4EBA-920F-71E3DD4789F4,HeciRuntimeDxe
 870E0F5A-1981-45F6-AE26-0391425CC46F,CpuCsrAccessSMM
@@ -2035,15 +2034,15 @@
 876730C9-9A69-4508-9579-CEBD1462A5FE,AmiSsidInit
 878AC2CC-5343-46F2-B563-51F89DAF56BA,IntelIGopVbt
 87AB821C-79B8-4EF6-A913-21D22063F55F,AcpiPlatform
-87C76262-F1F3-4452-B805-47438A6793A7,file_SgDxePolicyInit
+87C76262-F1F3-4452-B805-47438A6793A7,SgDxePolicyInit
 87C8BAD7-0595-4053-8297-DEDE395F5D5B,EfiDhcp6ProtocolGuid
 87D402CD-8B07-4B93-B38B-F8799F28B033,TXTWrapperDxe
-87DD3539-0667-4BB7-9FB2-47D3C50B021B,gPhoenixDesktopMessageProtocolGuid
+87DD3539-0667-4BB7-9FB2-47D3C50B021B,PhoenixDesktopMessageProtocolGuid
 87E1BB14-4D5C-7C4E-A90E-E1415687D062,EmuTimer
 87E36301-0406-44DB-AAF3-9E0E591F3725,VConfig
-87E4A8F8-B74A-40B5-B019-E10A5DE11236,file_VbiosHook
+87E4A8F8-B74A-40B5-B019-E10A5DE11236,VbiosHook
 87EA012D-CBAD-44C1-8431-61193A060941,PeriodicSmiControl
-87FFC11C-D0AB-4D12-A779-0A5474050759,GUID_DRVR_OemProtocol
+87FFC11C-D0AB-4D12-A779-0A5474050759,OemProtocol
 8803FA9A-0D33-4022-856B-AB5932A0F8BF,AmdInitPostPeimPei
 880AACA3-4ADC-4A04-9079-B747340825E5,EfiPropertiesTableGuid
 882C5E65-D37B-441B-A1D9-6C89C5CC3AE1,UsbDonglePei
@@ -2056,22 +2055,22 @@
 88C065E7-900D-4899-B7B0-CD404E113F95,PchPortCF9hTrap
 88C61F0D-DFA9-4087-8687-626A8B010E0C,PasswordLockSmall
 88C9D306-0900-4EB5-8260-3E2DBEDA1F89,PeiPostScriptTablePpiGuid
-88EA1FCB-3A5D-4ACF-A0B3-AACB36D4E90F,file_UsbLegacyControl
-88EC827F-6CDE-41DD-8B55-BD62449C4F1B,gVbtMipiPanel2Guid
+88EA1FCB-3A5D-4ACF-A0B3-AACB36D4E90F,UsbLegacyControl
+88EC827F-6CDE-41DD-8B55-BD62449C4F1B,VbtMipiPanel2Guid
 88FAE289-0A6A-4097-9CCA-2BED645B094D,AplDxeIpl
 890A3508-E816-41CF-B7E6-ED28E5BB5C28,AmtCompatiblity
-890C2CEF-43C8-4209-A78D-AE14AA1798B4,gAmiTcgPlatformPpiAfterMem
+890C2CEF-43C8-4209-A78D-AE14AA1798B4,AmiTcgPlatformPpiAfterMem
 893BF598-FA5D-4B6C-8829-6016ECC443E7,MainErrorHandler
 8958EDFF-02F7-4E49-87B1-FBA4BE4E8768,SmbiosDataUpdateDxeLightningRidgeEXECB4
 8962C28B-0DFE-4739-A73F-092D374A7A13,efi_pop_RT_pressed
 8977B212-0A43-4048-993B-B39AC7B0FE21,gear9
 8987081E-DAEB-44A9-8BEF-A195B22D9417,BasePciLibPciExpress
-898890E9-84B2-4F3A-8C58-D8577813E0AC,gEfiBluetoothAttributeProtocolGuid
+898890E9-84B2-4F3A-8C58-D8577813E0AC,EfiBluetoothAttributeProtocolGuid
 899407D7-99FE-43D8-9A21-79EC328CAC21,Setup
 899AFD18-75E8-408B-A41A-6E2E7ECDF454,EfiExtendedSalMtcServicesProtocolGuid
 89A1B278-A1A1-4DF7-B137-DE5AD7C47913,EfiPchTokenSpaceGuid
-89ADA336-4455-11E0-B7E6-A801E0D72085,file_InitResetArch
-89E3C1DC-B5E3-4D34-AEAD-DD7EB2828C18,gUsbTimingPolicyProtocolGuid
+89ADA336-4455-11E0-B7E6-A801E0D72085,InitResetArch
+89E3C1DC-B5E3-4D34-AEAD-DD7EB2828C18,UsbTimingPolicyProtocolGuid
 89E549B0-7CFE-449D-9BA3-10D8B2312D71,S3Resume2Pei
 89F09528-C33A-47FB-BA19-FADE80A39F76,DxePlatformDxe
 8A002AF2-EC39-4B01-BC64-84284267DF44,ASM104X_PEI
@@ -2080,15 +2079,15 @@
 8A4E8240-74F8-4024-AE2B-B39221C9FA59,NvOptimusSMM
 8A6B4A83-42FE-45D2-A2EF-46F06C7D9852,EfiUserCredentialClassSecureCardGuid
 8A78B107-0FDD-4CC8-B7BA-DC3E13CB8524,PeiCpuIoPei
-8A91B1E1-56C7-4ADC-ABEB-1C2CA1729EFF,gAmiPostManagerProtocolGuid
+8A91B1E1-56C7-4ADC-ABEB-1C2CA1729EFF,AmiPostManagerProtocolGuid
 8A97B11E-EE8E-11E2-B664-047D7B99E097,AcpiOverride
 8AAEDB2A-A6BB-47C6-94CE-1B8096423F2A,EfiSocketServiceBindingProtocolGuid
 8AC88C0F-6220-F243-8E27-56E17CC503DB,AppleNetLoadFile2
 8B01E5B6-4F19-46E8-AB93-1C53671B90CC,EfiTpmDeviceInstanceTpm12Guid
-8B12F29F-7135-4EAB-AFDA-0512F74B65EA,GUID_DRVR_AmdSb900Dxe
+8B12F29F-7135-4EAB-AFDA-0512F74B65EA,AmdSb900Dxe
 8B24E4D4-C84C-4FFC-81E5-D3EACC3F08DD,ApplePlatformInfoDB
 8B5FBABD-F51F-4942-BF16-16AAA38AE52B,AcpiPlatform
-8B68002A-817B-0361-BABA-6341A44EA052,file_DPTFPolicy
+8B68002A-817B-0361-BABA-6341A44EA052,DPTFPolicy
 8B7E5420-1B71-442A-9916-C13A4FE02482,SmbiosDataUpdateDxeLightningRidgeEXRP
 8B8214F9-4ADB-47DD-AC62-8313C537E9FA,SmmBasePeim
 8B843E20-8132-4852-90CC-551A4E4A7F1C,EfiDevicePathToTextProtocolGuid
@@ -2103,19 +2102,19 @@
 8C376010-2400-4D7D-B47B-9D851DF3C9D1,PchMeUma
 8C3CFB87-F7AE-4A36-AAFF-931FDC5F436E,AzaliaInitPei
 8C439043-85CA-467A-96F1-CB14F4D0DCDA,LegacyRegionDxe
-8C4C9A41-BF56-4627-9E0A-C8386D66115C,gEfiTcgPlatformProtocolGuid
+8C4C9A41-BF56-4627-9E0A-C8386D66115C,EfiTcgPlatformProtocolGuid
 8C542316-A1E5-4001-89E7-15EDFF12577D,gear11
 8C783970-F02A-4A4D-AF09-8797A51EEC8D,PowerManagement
 8C87E0A0-B390-4BE3-819C-7C6C83CAE4EB,SmmBaseHelper
 8C8CE578-8A3D-4F1C-9935-896185C32DD3,EfiFirmwareFileSystem2Guid
 8C927876-EC71-4DE4-A91D-8AD478CA9539,CpuRas
-8C939604-0700-4415-9D62-1161DB8164A6,gAmiTcgPlatformProtocolguid
+8C939604-0700-4415-9D62-1161DB8164A6,AmiTcgPlatformProtocolguid
 8C9D8537-9479-40F4-8C82-70D1EF5F7353,UsbOcUpdateDxeLightningRidgeEXECB2
 8CB71915-531F-4AF5-82BF-A09140817BAA,FLASHMAPBIN
 8CC435C5-6330-4269-B0C3-E3BD05C86FB8,DebugCommunicationLibSerialPort
 8CE0E1E9-26DC-4F24-ADBD-6871B8223703,PciSdxcDxe
 8CE65FC0-8F33-42A7-A2EA-46DEBE231EA6,XhciDxe
-8CF2F62C-BC9B-4821-808D-EC9EC421A1A0,gEfiPartitionInfoProtocolGuid
+8CF2F62C-BC9B-4821-808D-EC9EC421A1A0,EfiPartitionInfoProtocolGuid
 8CFC5233-23C6-49E3-8A2D-7E581AB305BA,EdbCfg
 8CFDB8C8-D6B2-40F3-8E97-02307CC98B7C,EfiVariableIndexTableGuid
 8D12E231-C667-4FD1-98F2-2449A7E7B2E5,EfiSmmControlProtocolGuid
@@ -2123,7 +2122,7 @@
 8D1AE715-7F82-449D-A26C-62AC650AF73F,Int15PanelType
 8D1F8D27-31C2-4B5B-B736-4BB5B4A25FBA,ASRGetDLSiteWrapper
 8D25EF2C-2015-416E-B8AA-2369FECD4BDA,CTA9x4ArmVExpressLibSec
-8D3BE215-D6F6-4264-BEA6-28073FB13AAA,file_ChipsetSmmThunk
+8D3BE215-D6F6-4264-BEA6-28073FB13AAA,ChipsetSmmThunk
 8D3BE215-D6F6-4264-BEA6-28073FB13AEA,SmmThunk
 8D463051-692F-4924-9AEC-0A833B1BA49B,PxeRomAr8132
 8D48BD70-C8A3-4C06-901B-747946AAC358,EfiIsaHcPpiGuid
@@ -2132,16 +2131,16 @@
 8D59EBC8-B85E-400E-970A-1F995D1DB91E,IntelSnbGopDriver
 8D6756B9-E55E-4D6A-A3A5-5E4D72DDF772,PciHostBridge
 8D7AE6A9-B490-45E1-8795-C2BEAADC3814,RawIp4Rx
-8DA47F11-AA15-48C8-B0A7-23EE4852086B,file_A01WMISmmHandler
+8DA47F11-AA15-48C8-B0A7-23EE4852086B,A01WMISmmHandler
 8DA5D50B-A39C-4FF7-AB4F-7426A145D0E4,RandomNumberGen
 8DD9176D-EE87-4F0E-8A84-3F998311F930,Dhcp6Dxe
 8DD9176E-EE87-4F0E-8A84-3F998311F930,Dhcp4Dxe
 8DD91798-EE87-4F0E-8A84-3F998311F930,ArpDxe
 8DE287AC-9460-465C-B8FA-F6E9866AE56D,xgbe_atl
-8DEEC992-D39C-4A5C-AB6B-986E14242B9D,gEfiDiskInfoSdMmcInterfaceGuid
+8DEEC992-D39C-4A5C-AB6B-986E14242B9D,EfiDiskInfoSdMmcInterfaceGuid
 8DF01A06-9BD5-4BF7-B021-DB4FD9CCF45B,EfiHashAlgorithmSha224Guid
 8DFAE5D4-B50E-4C10-96E6-F2C266CACBB6,VideoRom
-8E008510-9BB1-457D-9F70-897ABA865DB9,gEfiLegacyBiosExtProtocolGuid
+8E008510-9BB1-457D-9F70-897ABA865DB9,EfiLegacyBiosExtProtocolGuid
 8E325979-3FE1-4927-AAE2-8F5C4BD2AF0D,SdMmcPciHcDxe
 8E477676-55FD-48CF-9210-15A99B27D740,Slp10
 8E61FD6B-7A8B-404F-B83F-AA90A47CABDF,SmmSmbiosElog
@@ -2160,7 +2159,7 @@
 8F5A2E02-538C-4D59-B920-C4786ACBC552,Ahci
 8F5C2D02-AF2B-49DE-B8D8-DF90130A2512,FlashMeDxe
 8F644FA9-E850-4DB1-9CE2-0B44698E8DA4,EfiFirmwareVolumeBlock2ProtocolGuid
-8F76DA58-1F99-4275-A4EC-4756515B1CE8,gEfiBluetoothLeConfigProtocolGuid
+8F76DA58-1F99-4275-A4EC-4756515B1CE8,EfiBluetoothLeConfigProtocolGuid
 8F7D7B1D-0E1C-4C98-B12E-4EC99C4081AC,EmptyApplication
 8F92960E-2880-4659-B857-915A8901BDC8,Ip6Dxe
 8F92960F-2880-4659-B857-915A8901BDC8,Ip4Dxe
@@ -2168,17 +2167,17 @@
 8F98528C-F736-4A84-AAA3-376A8E43BF51,ImagePasswordEmpty
 8FAAD0A7-02B4-432F-8F5C-B880965D8B41,SmmCommunicationBufferDxe
 8FBECFE2-1313-4CF6-AD2C-D3B9472F62D3,SmartTimer
-8FE545E5-DCA9-4D52-BFCD-8F13E717015F,gAmiReflashProtocolGuid
+8FE545E5-DCA9-4D52-BFCD-8F13E717015F,AmiReflashProtocolGuid
 9006872D-3A86-4BAE-A2F0-E527B9D7119E,IntelLanUefiDriver
 9029F23E-E1EE-40D1-9382-36DD61A63EAA,NCT6683DPeiInit
 9042A9DE-23DC-4A38-96FB-7ADED080516A,EfiGraphicsOutputProtocolGuid
 905CF1B3-32F8-489C-A641-46A714583262,PcieErrorEnable
 905DC1AD-C44D-4965-98AC-B6B4444BFD65,UfsPciHcPei
-9069C144-0A7E-41EF-9C07-418BCA9BF939,AcpiDebugSmm
+9069C144-0A7E-41EF-9C07-418BCA9BF939,AcpiDebuSmm
 907125C0-A5F1-11E3-A3FE-A3198B49350C,FvSimpleFileSystem
 9073E4E0-60EC-4B6E-9903-4C223C260F3C,EfiVendorKeysNvGuid
 908C3852-B61B-4F26-AB66-F74F97E7DC1C,AMTbypass
-9096EB5B-59D1-49F8-866C-78D24631A6B4,gEndOfDxeBeforePciEnumEventGroupGuid
+9096EB5B-59D1-49F8-866C-78D24631A6B4,EndOfDxeBeforePciEnumEventGroupGuid
 90A330BD-6F89-4900-933A-C25EB4356348,SDController
 90B2B846-CA6D-4D6E-A8D3-C140A8E110AC,SystemFirmwareDescriptor
 90C8D394-4E04-439C-BA55-2D8CFCB414ED,SataDriver
@@ -2187,7 +2186,7 @@
 90FAE0B9-AC26-4482-B532-9BED052A8F8B,VmwVariableDxe
 9100696B-368F-4F9A-984A-D606E578CCC1,SetupConfigUpdateDxeLightningRidgeEXRP
 910DCA07-1F94-4EE7-AF2F-FF72F3154353,EfiSmmBaseHelperReadyProtocolGuid
-911D584C-35F7-4955-BEF9-B452769DDC3A,DebugSupportDxe
+911D584C-35F7-4955-BEF9-B452769DDC3A,DebuSupportDxe
 912740BE-2284-4734-B971-84B027353F0C,FspHeaderFileGuid
 914AEBE7-4635-459B-AA1C-11E219B03A10,EfiMdePkgTokenSpaceGuid
 91538AC9-A5D3-4DEF-9A70-28A087DEFA79,AppleDataHubUpdate
@@ -2198,11 +2197,11 @@
 919B9699-8DD0-4376-AA0B-0E54CCA47D8F,FPVARIABLE
 91A1DDCF-5374-4939-8951-D7293F1A786F,EnhancedSpeedstepProtocolGuid
 91A737E6-7B54-4B5F-A491-ED5EF5C5A732,LastBootErrorLog
-91ABC830-16FC-4D9E-A189-5FC8BB411402,gAmiSmmDigitalSignatureProtocolGuid
-91B43F81-DFCA-4EBA-93E1-FAD501E8F6D2,gAmiScceMMCEnabledPpiGuid
+91ABC830-16FC-4D9E-A189-5FC8BB411402,AmiSmmDigitalSignatureProtocolGuid
+91B43F81-DFCA-4EBA-93E1-FAD501E8F6D2,AmiScceMMCEnabledPpiGuid
 91B4D9C1-141C-4824-8D02-3C298E36EB3F,SataDriver
 91B886FD-2636-4FA8-A4A9-2EB04F235E09,CpuPeiBeforeMem
-91C74E50-361D-4CDA-A16B-C92BE4BF16EE,gAmiTcmSignalguid
+91C74E50-361D-4CDA-A16B-C92BE4BF16EE,AmiTcmSignalguid
 91F6E9EB-9902-44B3-A487-C8E148D0F4EE,EmcaErrorLog
 9204A71D-2050-4AB7-AD42-749CF9ADB4EB,Lpc47N20x
 9205CDE5-5AE5-4A4B-BFBF-F6211967EEF9,LibLocale
@@ -2229,7 +2228,7 @@
 932C56C9-EB98-43C6-8514-2EB8A31B5277,HpIOXAccess
 932F47E6-2362-4002-803E-3CD54B138F85,EfiScsiIoProtocolGuid
 93390241-7D4D-4986-8A06-D46C982F5ECD,CrystalRidgePeim
-934CE8DA-5E2A-4184-8A15-8E0847988431,gAmiOptionRomPolicyProtocolGuid
+934CE8DA-5E2A-4184-8A15-8E0847988431,AmiOptionRomPolicyProtocolGuid
 935D2F78-3A1F-4DE6-B28D-123A40DD2DEC,SmmGenericElog
 937FE521-95AE-4D1A-8929-48BCD90AD31A,EfiIp6ConfigProtocolGuid
 93B80003-9FB3-11D4-9A3A-0090273FC14D,IsaSerialDxe
@@ -2240,8 +2239,8 @@
 93C95FC4-B741-4587-9304-1C5A2BE6F742,ApplePlatformSecurityPolicy
 93E34C7E-B50E-11DF-9223-2443DFD72085,ArmVeNorFlashDxe
 93F1025B-B6D4-4F2F-A4A9-A4ABA0CF604F,aDefaultDxe
-9400D59B-0E9C-4F6C-B59A-FC20009DB9EC,gAmiPciIrqProgramGuid
-9401BD4F-1A00-4990-AB56-DAF0E4E348DE,gAmiHddSmartInitProtocolGuid
+9400D59B-0E9C-4F6C-B59A-FC20009DB9EC,AmiPciIrqProgramGuid
+9401BD4F-1A00-4990-AB56-DAF0E4E348DE,AmiHddSmartInitProtocolGuid
 9437D7F5-6D31-4494-9A4B-F6EEB21B6CC3,SioScriptPEI
 943D6B8B-D4D0-4005-81A0-AF26E5E07F03,MeFwLayout
 94440339-CC93-4506-B4C6-EE8D0F4CA191,EdkiiNonDiscoverableAmbaDeviceGuid
@@ -2254,13 +2253,13 @@
 94B9E8AE-8877-479A-9842-F5974B82CED3,EfiBoardFeaturesGuid
 94E24C26-80FA-427D-80FB-E374E9E9BF85,Dhcp6
 94ED2946-24EA-11DF-AF40-4300B0D2BA57,LegacyMemoryAllocatorDxe
-94EDD12A-419B-447F-9434-9B3B70783903,file_DxePlatform
+94EDD12A-419B-447F-9434-9B3B70783903,DxePlatform
 950216A2-A621-479C-A13D-2990617BDFE7,ReadOnlyVariable2OnReadOnlyVariableThunk
 950E191B-8524-4F51-80A1-5C4F1B03F35C,PeiSha256HashPpiGuid
 951B65E5-8872-41ED-AD1D-D5681F4AF033,EfiSpiHostProtocolGuid
 952821AA-EACD-465B-B478-5429DFC9A747,OA2
 952CB795-FF36-48CF-A249-4DF486D6AB8D,EfiTlsServiceBindingProtocolGuid
-9546E07C-2CBB-4C88-986C-CD341086F044,EfiDebugSupportPeriodicCallbackProtocolGuid
+9546E07C-2CBB-4C88-986C-CD341086F044,EfiDebuSupportPeriodicCallbackProtocolGuid
 9588502A-5370-11E3-8631-D7C5951364C8,AndroidFastbootApp
 95A1046F-5EA7-4C6D-86A7-AA91B7421E68,CspFlashPeiLibNull
 95A9A93E-A86E-4926-AAEF-9918E772D987,EfiEraseBlockProtocolGuid
@@ -2270,7 +2269,7 @@
 95C8D770-E1A4-4422-B263-E32F14FD8186,Ax88772b
 95DFCAE5-BB28-4D6B-B1E2-3AF3A6BF434F,PTID
 95E3669D-34BE-4775-A651-7EA41B69D89E,Dhcp6Dxe
-95E8152B-1B98-4F11-8A77-DB26583EBC42,gAmiPeiSbInitPolicyGuid
+95E8152B-1B98-4F11-8A77-DB26583EBC42,AmiPeiSbInitPolicyGuid
 95ECB758-627E-4A2E-B7B8-DC863EFE3425,AmiDeviceGuardApi
 96107C8E-9490-4767-9D0D-5590F1F6E1FC,PhysicalPresenceDxe
 961578FE-B6B7-44C3-AF35-6BC705CD2B1F,FatDxe
@@ -2294,7 +2293,7 @@
 9727502C-034E-472B-8E1B-67BB28C6CFDB,DebugAgentDxe
 9737D7CA-D869-45E5-A5EF-75D9438688DE,PlatformGOPPolicy
 9759BD61-F11E-4FEE-9004-1E8C88E72223,gear10
-977C97C1-47E1-4B6B-9669-436699CBE45B,gSiPkgTokenSpaceGuid
+977C97C1-47E1-4B6B-9669-436699CBE45B,SiPkgTokenSpaceGuid
 978D7247-98EA-4A14-BF98-32A35F34566B,AcpiPowerButton
 978FE043-D7AF-422E-8A92-2B48E463BDE6,EfiKmsFormatGeneric512Guid
 97AF1D95-203C-42DE-8D6B-D13EB7E5A55A,PEfirmwareupdateEfi
@@ -2305,27 +2304,27 @@
 97CC7188-79C9-449F-B969-065B64BF9C69,BiosExtensionLoader
 97CDCF04-4C8E-42FE-8015-11CC8A6E9D81,Tpm2DeviceLibRouterPei
 97E35ADE-233D-4F18-828A-8A0524EBEDDE,menu_none_selected
-97E8965F-C761-4F48-B6E4-9FFA9CB2A2D6,gAmiDeploymentModeNvGuid
-97F91E78-EA12-4EA6-B7B3-7B0678C28673,gAmiPeiPciTableInitPpiGuid
-981A25E0-0D83-436D-9184-C1AA53BB143A,file_SmmOemServicesDriver
-981AD9CD-8685-4AAB-AFDA-0512F74B65EA,GUID_DRVR_SB900SmbusLight
+97E8965F-C761-4F48-B6E4-9FFA9CB2A2D6,AmiDeploymentModeNvGuid
+97F91E78-EA12-4EA6-B7B3-7B0678C28673,AmiPeiPciTableInitPpiGuid
+981A25E0-0D83-436D-9184-C1AA53BB143A,SmmOemServicesDriver
+981AD9CD-8685-4AAB-AFDA-0512F74B65EA,SB900SmbusLight
 982C298B-F4FA-41CB-B838-77AA688FB839,EfiUgaDrawProtocolGuid
 982DDBE9-2B79-485F-9AC3-FA67B508C913,Vmxnet3Dxe
 9842073D-95D9-9F49-BD3F-2E29525125DF,EmuBusDriver
-9851740C-22E0-440D-9090-EF2D71C251C9,gAmiCmosAccessDxeProtocolGuid
+9851740C-22E0-440D-9090-EF2D71C251C9,AmiCmosAccessDxeProtocolGuid
 98584C0B-49D6-4BAF-B542-ECEE2582409C,ASUSBackup
 9876CCAD-47B4-4BDB-B65E-16F193C4F3DB,EfiProcessorGenericErrorSectionGuid
-987EA6EA-FBFD-4273-B819-A7210ADF6760,file_StatusCodeReport
+987EA6EA-FBFD-4273-B819-A7210ADF6760,StatusCodeReport
 98948C4A-70F2-4035-8E9F-5927493CFC07,FaultTolerantWriteSmmDxe
 989B6C1C-6FE1-D64E-A292-1313C410F0F2,Ip4Config
 98B8D59B-E8BA-48EE-98DD-C295392F1EDB,EfiConfigFileNameGuid
 98BBCDA4-18B4-46D3-BD1F-6A3A52D44CF8,SmmAccess2OnSmmAccessThunk
 98C281E5-F906-43DD-A92B-B003BF2765DA,PeiNtThunkPpiGuid
 98C8588C-640A-4BB4-AEA0-3F81CDE17524,FspDxeIpl
-994C5A88-FCE2-43E5-9EA4-2FABCB15301D,file_SmmStatusCode
+994C5A88-FCE2-43E5-9EA4-2FABCB15301D,SmmStatusCode
 9950A4C8-F315-4FCE-ADC8-E1BB61F1CCCB,PeiHeciPei
 99549F44-49BB-4820-B9D2-901329412D67,IdeController
-995C6ECA-171B-45FD-A3AA-FD4C9C9DEF59,gEfiSpiSmmConfigurationProtocolGuid
+995C6ECA-171B-45FD-A3AA-FD4C9C9DEF59,EfiSpiSmmConfigurationProtocolGuid
 9962883C-C025-4EBB-B699-4EA4D147C8A8,AmiTxtTcgPeim
 996EC11C-5397-4E73-B58F-827E52906DEF,EfiVectorHandoffTableGuid
 99796403-CF03-42EC-A817-7183411D79E2,PchSmbusDxe_
@@ -2359,7 +2358,7 @@
 9BA21891-7E7D-4E94-B8DF-F4D2D320801C,ROMss
 9BB65D37-8CA8-4789-BE45-EE18536EE089,UsbOcUpdateDxeNeonCityEPECB
 9BBE29E9-FDA1-41EC-AD52-452213742D2E,EdkiiFormDisplayEngineProtocolGuid
-9BEC7109-6D7A-413A-8E4B-019CED0503E1,gAmiBoardInfoSectionGuid
+9BEC7109-6D7A-413A-8E4B-019CED0503E1,AmiBoardInfoSectionGuid
 9C0AAED4-74C5-4043-B417-A3223814CE76,ArmPlatformTokenSpaceGuid
 9C1080EE-D02E-487F-9432-F3BF086EC180,GenericMemoryTestDxe
 9C109E5E-BF38-4A78-9CAC-43DE7E726F9E,AmiMemoryAbsentOverrideGuid
@@ -2369,26 +2368,26 @@
 9C76C900-1E8C-11E0-8766-0002A5D5C51B,L2X0CacheLibNull
 9C7C3AA7-5332-4917-82B9-56A5F3E62A07,FspReservedMemoryResourceHobGfxGuid
 9C7CCB02-9154-4864-9E4B-DC0487E37660,DhcpDummyDxe
-9C939BA6-1FCC-46F6-B4E1-102DBE186567,gEfiAcpiDisDispatchProtocolGuid
-9C98C00A-2E9B-4896-95C8-AC64358284E5,gAmiDxeHashInterfaceguid
+9C939BA6-1FCC-46F6-B4E1-102DBE186567,EfiAcpiDisDispatchProtocolGuid
+9C98C00A-2E9B-4896-95C8-AC64358284E5,AmiDxeHashInterfaceguid
 9CA93627-B65B-4324-A202-C0B461764543,EfiPeiSmbus2PpiGuid
 9CB0F5CC-B0F3-4ADD-8583-3C8AF6C00DE0,DxeS3BootScriptLibS3SaveStateProtocol
-9CB2E73F-7325-40F4-A484-659BB344C3CD,gSgxPolicyStatusGuid
+9CB2E73F-7325-40F4-A484-659BB344C3CD,SgxPolicyStatusGuid
 9CBA9D12-A029-4366-AB1E-172B81914757,OntarioGenericVBios
 9CC55D7D-FBFF-431C-BC14-334EAEA6052B,SmmCoreDispatcherDxe
 9CCA03FC-4C9E-4A19-9B06-ED7B479BDE55,EfiSmmPeriodicTimerDispatchProtocolGuid
-9CE4D938-9C87-41D0-9E55-34923FAF8B4F,gAmiPeiNbInitPolicyGuid
+9CE4D938-9C87-41D0-9E55-34923FAF8B4F,AmiPeiNbInitPolicyGuid
 9CF30325-DC5C-4556-A8B0-74215C5F7FC4,HeciPei
 9CFD802C-09A1-43D6-8217-AA49C1F90D2C,Mebx
 9D0CEA63-745B-417D-BBA4-E5193061C907,DxeFrb
 9D1A8B60-6CB0-11DE-8E91-0002A5D5C51B,ThunderboltNhiDxe
 9D225237-FA01-464C-A949-BAABC02D31D0,StatusCodeHandlerPei
-9D36F7EF-6078-4419-8C46-2BBDB0E0C7B3,gAmiBoardSioInitProtocolGuid
+9D36F7EF-6078-4419-8C46-2BBDB0E0C7B3,AmiBoardSioInitProtocolGuid
 9D52E46E-F07E-44E8-9A90-F8576C91C211,BaseFspDebugLibSerialPort
 9D60F495-DBF2-4B06-AFCA-F62C1C89647F,PasswordLockWhite
 9D7A05E9-F740-44C3-858B-75586A8F9C8E,dbxVar
 9D9A39D8-BD42-4A73-A4D5-8EE94BE11380,EfiDhcp4ServiceBindingProtocolGuid
-9DA34AE0-EAF9-4BBF-8EC3-FD60226C44BE,gEfiResetNotificationProtocolGuid
+9DA34AE0-EAF9-4BBF-8EC3-FD60226C44BE,EfiResetNotificationProtocolGuid
 9DC0DDAA-56BD-447A-95CC-5180433110F9,menu_top_left
 9E0C30BC-3F06-4BA6-8288-09179B855DBE,FrameworkBdsFrontPageFormsetGuid
 9E23D768-D2F3-4366-9FC3-3A7ABA864374,EfiVlanConfigProtocolGuid
@@ -2427,13 +2426,13 @@
 9FE1D71B-3F91-4103-AE62-3FEECA4D2BAA,SpiFlash
 9FE7DE69-0AEA-470A-B50A-139813649189,KekVar
 A00490BA-3F1A-4B4C-AB90-4FA99726A1E8,EfiBlockIoCryptoProtocolGuid
-A017BA59-DCAD-473B-BBB3-294E9AF20D34,GUID_PEIM_OemPeiHook
+A017BA59-DCAD-473B-BBB3-294E9AF20D34,OemPeiHook
 A01E498C-96E8-2A4C-95F4-85248F989753,FwBlockService
 A023D3F6-F297-4307-8552-E6572B30B520,menu_mid_mid
 A023D4A1-05A1-4797-B84F-03B854FD05F1,EneDXE
 A030D115-54DD-447B-9064-F206883D7CCC,PeiTpmInitializationDonePpiGuid
-A0337044-949C-423E-B581-DAE2AD435534,gVbtInfoGuid
-A034147D-690C-4154-8DE6-C044641DE942,gFspVariableNvDataHobGuid
+A0337044-949C-423E-B581-DAE2AD435534,VbtInfoGuid
+A034147D-690C-4154-8DE6-C044641DE942,FspVariableNvDataHobGuid
 A03A9429-C570-4EF9-9E00-C7A673976E5F,SmmControlDxe
 A04A27F4-DF00-4D42-B552-39511302113D,DriverSampleFormSetGuid
 A0534D92-9776-4E4E-9234-C9DC1849DBB5,PlatformFlashAccessLibNull
@@ -2441,7 +2440,7 @@ A053F561-F56B-4140-8901-B4CB5D70929E,BootScriptThunkGuid
 A05B6FFD-87AF-4E42-95C9-6228B63CF3F3,EfiSmmUsbDispatchProtocolGuid
 A05ECE52-15A8-424E-BFD3-FCF3D566A09C,AmtPeiPolicyInit
 A05F5C06-1782-48AA-962A-86A0892022B6,ASM1061Dxe
-A062CF1F-8473-4AA3-8793-600BC4FFA9A9,gEfiLegacySredirProtocolGuid
+A062CF1F-8473-4AA3-8793-600BC4FFA9A9,EfiLegacySredirProtocolGuid
 A062CF1F-8473-4AA3-8793-600BC4FFE9A8,CsmDxe
 A071C476-F78C-41C2-A173-B43D699A2C80,AppleEfiSocShutdown
 A07D8A73-D4F9-4AA0-BC25-391CCFC47E98,I2cControllerTemplate
@@ -2452,7 +2451,7 @@ A0C0B7EF-99FF-417F-8B9F-5AD4701D90D6,Tpm12DeviceLibAtmelI2c
 A0C98B77-CBA5-4BB8-993B-4AF6CE33ECE4,Tcg2Pei
 A0E8E04C-9B5A-43BE-8B7D-C98760492B68,SectionExtractionDxe
 A0E8EE6A-0E92-44D4-861B-0EAA4ACA44A2,EfiKmsFormatAescbc128Guid
-A0EAF572-69D8-4825-B1B0-9EE3B4C64FA7,ASUSGamingBoard
+A0EAF572-69D8-4825-B1B0-9EE3B4C64FA7,ASUSAmingBoard
 A0EF80E3-F9AB-4CBA-98FD-704620F4048D,SecFlashUpdDxe
 A1147A20-3144-4F8D-8295-B48311C8E4A4,ArmJunoTokenSpaceGuid
 A11585B7-8FA2-4F1C-AA6F-DD6309469613,MEFwUpdLcl
@@ -2467,7 +2466,7 @@ A19B1FE7-C1BC-49F8-875F-54A5D542443F,CpuIo2Dxe
 A19FB0EE-05F4-4CD6-8F28-59B782FF95C6,PciExpress
 A1AFF049-FDEB-442A-B320-13AB4CB72BBC,EfiMdeModulePkgTokenSpaceGuid
 A1B0B230-67DC-431E-A94A-A96AF1EBE637,Tpm2DeviceLibTcg2
-A1C85085-3053-4C4B-A9F6-724D22A76EF9,gAmiLegacyTpmguid
+A1C85085-3053-4C4B-A9F6-724D22A76EF9,AmiLegacyTpmguid
 A1DD808E-1E95-4399-ABC0-653C82E8530C,JunoAcpiTableFile
 A1E37052-80D9-4E65-A317-3E9A55C43EC9,EfiIdeControllerInitProtocolGuid
 A1F436EA-A127-4EF8-957C-8048606FF670,UndiRuntimeDxe
@@ -2476,7 +2475,7 @@ A216E8AB-19A4-43FF-86A3-C57938F03B06,FireWireDevice
 A2271DF1-BCBB-4F1D-98A9-06BC172F071A,EfiExtendedSalFvBlockServicesProtocolGuid
 A29A63E3-E4E7-495F-8A6A-07738300CBB3,AmiTcgPlatformDXE
 A2AB9D42-967A-45B3-9507-28CCC7021F51,UnknownBoot
-A2C74B0C-F38F-42F6-A147-379013ED92ED,GUID_DRVR_OemSMBIOS
+A2C74B0C-F38F-42F6-A147-379013ED92ED,OemSMBIOS
 A2CC7663-4D7C-448A-AAB5-4C034B6FDAB7,rmHwA5Guid
 A2CF63C6-D44F-4CD0-8AF6-722A0138C021,ArmPlatformLibSecNull
 A2DE77BB-797D-4BB5-80C4-19AEB8B5CD29,ASUSFAKESMI
@@ -2502,7 +2501,7 @@ A3EAAB3C-BA3A-4524-9DC7-7E339996F496,ASUSRT
 A3F436EA-A127-4EF8-957C-8048606FF670,BCDxe
 A3FF0EF5-0C28-42F5-B544-8C7DE1E80014,PiSmmCpuDxeSmm
 A40DAE55-2F33-42F5-B064-C8D62CCF3B87,AppleSystemInitialization
-A42B4684-26EA-40D0-AA38-94C21C3C4E59,GUID_PEIM_ATIPwrXPEI
+A42B4684-26EA-40D0-AA38-94C21C3C4E59,ATIPwrXPEI
 A42F4ACF-5A88-4DE3-A54D-EE7CA94C1246,AppleSpiIoCnl
 A4524A9C-0B5E-492D-AEC9-308631B189B4,AmiSetTcgReadytobootGuid
 A45E60D1-C719-44AA-B07A-AA777F85906D,PeiAtaControllerPpiGuid
@@ -2520,7 +2519,7 @@ A4EC8ADB-B7A8-47D1-8E52-EC820D0ACF6F,FvbSmm
 A4EE0728-E5D7-4AC5-B21E-658ED857E834,ArmMpCoreInfoGuid
 A4F2909C-5E2A-438A-91BA-272B0923049A,PlatformSetup
 A510A614-2192-11DF-AF29-2754E86B3594,PciExpressHostBridge
-A52509C7-5ECD-42D1-85A2-46C37135D12D,file_GopPolicy
+A52509C7-5ECD-42D1-85A2-46C37135D12D,GopPolicy
 A5288050-8828-46C4-8F72-1CD735A56520,Slp20Dxe
 A55701F5-E3EF-43DE-AC72-249B573FAD2C,EfiIa32X64ErrorTypeCacheCheckGuid
 A56074DB-65FE-45F7-BD21-2D2BDD8E9652,EfiLegacyDevOrderVariableGuid
@@ -2537,7 +2536,7 @@ A5C1EF72-9379-4370-B4C7-0F5126CAC38E,TrEEConfigPei
 A5C6D68B-E78A-4426-9278-A8F0D9EB4D8F,UsbMassStorageDxe
 A6077307-B297-4051-9AC0-A0DC8147E601,menu_locked
 A60C6B59-E459-425D-9C69-0BCC9CB27D81,EfiGetPcdInfoPpiGuid
-A62D933A-9293-4D9F-9A16-CE81994CC4F2,AppleDebugSupport
+A62D933A-9293-4D9F-9A16-CE81994CC4F2,AppleDebuSupport
 A630B937-3AB3-4263-85B1-A63E98F29949,PcieErrorHandler
 A673005A-69F6-4597-8AF9-7AACA0039296,Int15BootDisplay
 A6885402-D022-4B0E-A509-4711B90F2A39,ReportStatusCodeRouterSmm
@@ -2547,7 +2546,7 @@ A6AEF1F6-F25A-4082-AF39-2229BCF5A6E1,AmtStatusCodePei
 A6F691AC-31C8-4444-854C-E2C1A6950F92,DuetBds
 A732241F-383D-4D9C-8AE1-8E09837589D7,XenBusRootDeviceGuid
 A73D663D-A491-4278-9A69-9521BE3379F2,ArmVeTimerDxe
-A76B4E22-B50A-401D-8B35-5124B0BA4104,gTcgPeiPolicyGuid
+A76B4E22-B50A-401D-8B35-5124B0BA4104,TcgPeiPolicyGuid
 A770C357-B693-4E6D-A6CF-D21C728E550B,EdkiiFormBrowserEx2ProtocolGuid
 A7717414-C616-4977-9420-844712A735BF,EfiCertTypeRsa2048Sha256Guid
 A77B2472-E282-4E9F-A245-C2C0E27BBCC1,EfiBlockIo2ProtocolGuid
@@ -2556,25 +2555,25 @@ A7AF67CB-603B-4D42-BA21-70BFB6293F96,EfiRngAlgorithmSp80090Hash256Guid
 A7C0687A-E8B9-42EC-B8A5-A950DF6EF94A,AlternativeDefaultMemoryQuota
 A7C619FF-9A64-4A89-947B-E7953E2427CB,ASUSBS
 A7CED760-C71C-4E1A-ACB1-89604D5216CB,EfiIioUdsProtocolGuid
-A7EDEBD8-A8D7-48F8-81FB-837656B82077,gAmiNvramBackupRomAreaGuid
-A8021F3B-B649-4C18-8270-A796ACCF32E1,gEfiEmmcWpHobGuid
-A80E8FC8-332C-4359-9622-84E83D90FD5A,GUID_PEIM_BiosCriticalInfo
+A7EDEBD8-A8D7-48F8-81FB-837656B82077,AmiNvramBackupRomAreaGuid
+A8021F3B-B649-4C18-8270-A796ACCF32E1,EfiEmmcWpHobGuid
+A80E8FC8-332C-4359-9622-84E83D90FD5A,BiosCriticalInfo
 A8154B55-2021-4D40-AE81-2E23A02DCC46,FtdiUsbSerialDxe
 A8499E65-A6F6-48B0-96DB-45C266030D83,SiInitPreMem
-A84B495B-79F4-40AB-8B60-653F69DCD944,gAmiHeciDeliverProtocolGuid
+A84B495B-79F4-40AB-8B60-653F69DCD944,AmiHeciDeliverProtocolGuid
 A85027FC-0E09-4FA9-A407-CAD206FB4F1D,PlatformStage1Pei
 A85DCA1B-198F-4E14-A673-874264687E85,DataSink
 A883FD70-4E7E-4B17-8EBB-C5646FF154CA,SpiMouseDxe
 A8913EC1-C00C-4C3A-A245-077C0CA35738,AspmOverrideDxe
 A89EC8E0-0BA1-40AA-A03E-ABDDA5295CDE,PciExpressDxe
-A8A2093B-FEFA-43C1-8E62-CE526847265E,AmitcgefiOsVariableGuid
+A8A2093B-FEFA-43C1-8E62-CE526847265E,AmitcEfiOsVariableGuid
 A8BC51CC-5A30-41D5-8B1A-EB46ABC527FA,IioRas
 A8C67255-E029-4B1A-968E-ECA6E9C11C73,AmtSmbios
 A8CDA0A2-4F37-4A1B-8E10-8EF3CC3BF3A8,EdkiiNonDiscoverableUhciDeviceGuid
 A8CF6278-8758-458D-ADFB-3471F5AD50B1,HdPwdPeimPei
 A8E80DDF-A3BB-4880-9DB2-9BB1B8BB1212,SbMetronome
-A8F634A5-28F1-4456-A9D5-7E24B99BDB65,file_PcxDecoder
-A8F960C6-4CC3-4417-8AD9-2A3B3F8027EA,gAmiMemoryInfoGuid
+A8F634A5-28F1-4456-A9D5-7E24B99BDB65,PcxDecoder
+A8F960C6-4CC3-4417-8AD9-2A3B3F8027EA,AmiMemoryInfoGuid
 A912F198-7F0E-4803-B908-B757B806EC83,Hello
 A92CDB4B-82F1-4E0B-A516-8A655D371524,VirtioNetDxe
 A95C1D60-CB9F-4BD8-A030-3F1C4A185156,SecureBootMod
@@ -2585,19 +2584,19 @@ A9ACE824-4486-44E6-915A-8FBAED0799B9,SetupDataProviderDxe
 A9B700CF-019E-4D8B-A3A7-88E1EA01699E,HddSecurity
 A9CE66D5-6D37-451E-A9BF-F58F7A0B3CC2,ASM1061_DXE
 A9DC6F60-F861-47D1-8751-ECAAE7D27291,LibMath
-A9DD1597-F2C5-4CB6-AA7B-EE01AE806185,gAmiSmmNvmeControllerProtocolGuid
+A9DD1597-F2C5-4CB6-AA7B-EE01AE806185,AmiSmmNvmeControllerProtocolGuid
 A9F634A5-29F1-4456-A9D5-6E24B88BDB65,BmpDecoderDxe
 A9F8D54E-1107-4F0A-ADD0-4587E7A4A735,IntelSiliconPkgTokenSpaceGuid
 AA0E8BC1-DABC-46B0-A844-37B8169B2BEA,EfiPciHotPlugInitProtocolGuid
 AA48FBB2-9F87-4DFD-B416-575938F0C8F4,PropertiesTableAttributesDxe
-AA506A03-4A54-492B-8F2B-9AD9A949358A,gUfsBootLunIdHobGuid
+AA506A03-4A54-492B-8F2B-9AD9A949358A,UfsBootLunIdHobGuid
 AA5324ED-DC11-4D5D-A52B-FABDD7E80634,PlacementDxe
 AA652CB9-2D52-4624-9FAE-D4E58B67CA46,PchSpiPeim
 AA6E8785-726E-441D-ACB8-F75FB0B2B9F2,CoreEG2
 AA7B4695-00B4-4468-AD92-99370AC031C5,LegacyRegion2
 AA893E19-A641-4819-AD23-011B7C24250D,IT8728SioAcBackSmm
-AA924214-DFCB-4BEE-AA33-FAE9729AF000,file_A01ODMSmmServiceDriver
-AAB18F19-FE14-4666-8604-87FF6D662C9A,gEfiSpiSmmNorFlashProtocolGuid
+AA924214-DFCB-4BEE-AA33-FAE9729AF000,A01ODMSmmServiceDriver
+AAB18F19-FE14-4666-8604-87FF6D662C9A,EfiSpiSmmNorFlashProtocolGuid
 AABE9A45-B345-49D2-88EF-6AD0B85ED7E6,AmiRomLayoutProtocolGuid
 AABF95D6-F40C-405F-8360-6A59794B8040,BasePciSegmentLibPci
 AAC33064-9ED0-4B89-A5AD-3EA767960B22,FaultTolerantWritePei
@@ -2608,14 +2607,14 @@ AAE65279-0761-41D1-BA13-4A3C1383603F,Ozmosis
 AAEACCFD-F27B-4C17-B610-75CA1F2DFB52,EfiEbcVmTestProtocolGuid
 AAECDC89-2A49-46F1-A163-F7979C039998,IdeBusSrc
 AAF32C78-947B-439A-A180-2E144EC37792,EfiAuthenticatedVariableGuid
-AB1404CA-4801-4208-98BF-30D521DAD4D3,gAmiTseUserPasswordValidGuid
-AB1C1816-D542-4E6F-9B1E-8ECD9253E2E7,gArmGlobalVariablePpiGuid
+AB1404CA-4801-4208-98BF-30D521DAD4D3,AmiTseUserPasswordValidGuid
+AB1C1816-D542-4E6F-9B1E-8ECD9253E2E7,ArmGlobalVariablePpiGuid
 AB248E8D-ABE1-11D4-BD0D-0080C73C8881,WinNtUgaDxe
 AB248E99-ABE1-11D4-BD0D-0080C73C8881,EfiWinNtUgaGuid
 AB294A92-EAF5-4CF3-AB2B-2D4BED4DB63D,PeiMfgMemoryTestPpiGuid
 AB2BEE2F-C1A6-4399-853D-C07C774FFD0D,EfiLpcWpce791PolicyProtocolGuid
 AB38A0DF-6873-44A9-87E6-D4EB56148449,EfiRamDiskProtocolGuid
-AB5A4DF4-F0D7-49A8-BF5C-F25DA04C2533,gCpuGlobalNvsAreaProtocolGuid
+AB5A4DF4-F0D7-49A8-BF5C-F25DA04C2533,CpuGlobalNvsAreaProtocolGuid
 AB7ED12E-1D78-4635-AB87-23F00A911EC7,RomLayoutDxe
 AB8F1705-7EB6-4D08-A9B3-918BDE24F479,UpdatePcdPei
 ABAA46B8-84A3-4E74-882F-6368F6EDC9B8,HddPwdDxe
@@ -2639,7 +2638,7 @@ ACB93B08-5CDC-4A8F-93D4-06E342DF182E,PchPeiInitPpiGuid
 ACD03321-777E-4D3D-B1C8-20CFD88820C9,EfiRngAlgorithmX931AesGuid
 ACD28235-075B-48B5-98A1-DA04FCAF84F3,SiInitDxe
 AD0D149F-BA67-4E0B-A6A2-4E8853673EA5,ErrorGlobeTile
-AD14AC1B-DA15-4CE5-A7E2-1F5437EDB4B3,file_SmbiosMemory
+AD14AC1B-DA15-4CE5-A7E2-1F5437EDB4B3,SmbiosMemory
 AD15A0D6-8BEC-4ACF-A073-D01DE77E2D88,EfiVTUTF8Guid
 AD1F487A-BA56-48DC-8EAA-E8FBEA74B8F2,ASM104X_SMI
 AD21F7A0-7F5B-47FE-8CC0-241F318CABF5,AppleLegacyStartup
@@ -2652,7 +2651,7 @@ AD61999A-507E-47E6-BA28-79CC609FA1A4,FspWrapperNotifyDxe
 AD61F191-AE5F-4C0E-B9FA-E869D288C64F,EfiCpuIo2ProtocolGuid
 AD651C7D-3C22-4DBF-92E8-38A7CDAE87B2,VirtualUncachedPagesProtocolGuid
 AD70855E-0CC5-4ABF-8979-BE762A949EA3,IncompatiblePciDeviceSupport
-AD77AE29-4C20-4FDD-8504-8176619B676A,gAmiHddSecurityEndProtocolGuid
+AD77AE29-4C20-4FDD-8504-8176619B676A,AmiHddSecurityEndProtocolGuid
 AD9C4381-1EDE-430C-8D42-23767C465D52,EfiUsbKeyboardConnectGuid
 ADF01BF6-47D6-495D-B95B-687777807214,FirmwarePerformancePei
 ADF3A128-416D-4060-8DDF-30A1D7AAB699,EfiSmmIchnDispatch2ProtocolGuid
@@ -2670,7 +2669,7 @@ AE80D021-618E-11D4-BCD7-0080C73C8881,EfiDataHubProtocolGuid
 AE933E1C-CC47-4E38-8F0E-E2F61D2605DF,EfiPeiSmmCommunicationPpiGuid
 AEA6B965-DCF5-4311-B4B8-0F12464494D2,BootScriptDataGuid
 AEB9C5C1-94F1-4D02-BFD9-4602DB2D3C54,EfiTcg2PhysicalPresenceGuid
-AEBFFA01-7EDC-49FF-8D88-CB848C5E8670,gSiPolicyPpiGuid
+AEBFFA01-7EDC-49FF-8D88-CB848C5E8670,SiPolicyPpiGuid
 AEC4159D-F2FC-4090-95CE-38317A8ED64C,FirmwarePerformanceTable
 AED6AA78-D5BF-4BC5-8CC5-F9EE47CF9299,CapsuleRuntimeDxe
 AEDA2428-9A22-4637-9B21-545E28FBB829,EfiEblAddCommandProtocolGuid
@@ -2681,27 +2680,27 @@ AF060190-5E3A-4025-AFBD-E1F905BFAA4C,EfiHiiImageDecoderNamePngGuid
 AF23B340-97B4-4685-8D4F-A3F28169B21D,EdkiiVarCheckProtocolGuid
 AF382531-52E6-4CC4-B247-DB8E320CBBA3,SmbiosDMIEditBoard
 AF43E178-C2E9-4712-A7CD-08BFDAC7482C,UfsPciHcDxe
-AF4A1998-4949-4545-9C4C-C1E7C042E056,gScPcieDeviceTablePpiGuid
+AF4A1998-4949-4545-9C4C-C1E7C042E056,ScPcieDeviceTablePpiGuid
 AF4CC162-D41C-455A-AB45-6DBCC1CD32F3,LpssDummyProtocolGuid
 AF59F2F5-5E28-4E03-80E2-4727545AF811,PchReset
 AF6AC311-84C3-11D2-8E3C-00A0C969723B,EfiDeviceIoProtocolGuid
 AF9FFD67-EC10-488A-9DFC-6CBF5EE22C2E,EfiAcpiVariableGuid
-AFA4CF3F-AF71-4C30-A4FB-2910E771F9B0,gAmiNvmeControllerProtocolGuid
+AFA4CF3F-AF71-4C30-A4FB-2910E771F9B0,AmiNvmeControllerProtocolGuid
 AFBFDE41-2E6E-4262-BA65-62B9236E5495,EfiTimestampProtocolGuid
-AFC04099-0D39-405D-BE46-846F08C51A31,file_AcpiPlatform
+AFC04099-0D39-405D-BE46-846F08C51A31,AcpiPlatform
 AFFC90DD-B014-4737-89E9-D1A0F50CD25E,CPLDPEI
-AFFE115B-8589-456D-BAB5-8F2EDA53AEB7,gArmPlatformUpdateFdtEventGuid
+AFFE115B-8589-456D-BAB5-8F2EDA53AEB7,ArmPlatformUpdateFdtEventGuid
 B017C09D-EDC1-4940-B13E-57E95660C90F,AhciRom
 B03ABACF-A532-5E78-ACA0-B11F765B3AFD,CpuDxe
-B053ED84-880C-4F7E-A57E-2C82C6E9BCBF,GUID_DRVR_OemWlanBT
+B053ED84-880C-4F7E-A57E-2C82C6E9BCBF,OemWlanBT
 B0732526-38C8-4B40-8877-61C7B06AAC45,EfiCpuIoProtocolGuid
-B0767CBC-4705-4D35-8866-17A9B85E3843,gEfiMemoryConfigVariableGuid
+B0767CBC-4705-4D35-8866-17A9B85E3843,EfiMemoryConfigVariableGuid
 B0792197-ABC3-4BB1-9FD3-CBEA8FD41373,BaseAmiBeepLibNull
 B091E7D2-05A0-4198-94F0-74B7B8C55459,EfiFlashMapHobGuid
 B093BDD6-2DE2-4871-8768-EE1DA57249B4,TcgPasswordAuthenticationGuid
 B09CB87C-67D8-412B-BB9D-9F4B214D720A,VTd
-B09ED1E3-DDDF-429F-9780-C3B0C4857924,gScsConfigGuid
-B0AE3E81-C6B0-4D35-AD51-9117E0651EA3,gPlatformEmmcHs400TuningInfoGuid
+B09ED1E3-DDDF-429F-9780-C3B0C4857924,ScsConfigGuid
+B0AE3E81-C6B0-4D35-AD51-9117E0651EA3,PlatformEmmcHs400TuningInfoGuid
 B0C2372B-9393-4CBC-9CAF-53913C9DCE29,FlashDeviceFvbRuntimeDxe
 B0D6ED53-B844-43F5-BD2F-61095264E77E,PchSmiDispatcher
 B0D8F3C1-B7DE-4C11-BC89-2FB562C8C411,EdkiiSmmVarCheckProtocolGuid
@@ -2729,38 +2728,38 @@ B1CD7448-319C-41AA-821D-3E606BF6F90D,SmcOemActivation
 B1DA0ADF-4F77-4070-A88E-BFFE1C60529A,AMITSE
 B1E9E2CA-B078-4070-BCCD-87449AC7D2A6,CpuS3Pei
 B1EE129E-DA36-4181-91F8-04A4923766A7,EfiDriverFamilyOverrideProtocolGuid
-B1FBF84A-C091-4A80-A744-23442A2B7BDF,gAmiChipsetPkgTokenSpaceGuid
+B1FBF84A-C091-4A80-A744-23442A2B7BDF,AmiChipsetPkgTokenSpaceGuid
 B20005B0-BB2D-496F-869C-230B4479E7D1,EdkiiNonDiscoverableOhciDeviceGuid
 B219E140-DFFC-11E3-B956-0022681E6906,DnsDxe
 B2360B42-7173-420A-8696-46CA6BAB1060,MeasuredFvHobGuid
 B2585B69-FB63-4220-844A-8FBEA8BF01AF,PeiIoLibCpuIo
-B26B30A8-2172-4A46-9B4F-4D5B08DD6E40,T23OwnerStringService
+B26B30A8-2172-4A46-9B4F-4D5B08DD6E40,T23OwnerStrinService
 B273CC44-E62A-41DC-9CAD-BDB4235459D8,UnicodeCollationDxe
-B295BD1C-63E3-48E3-B265-F7DFA2070123,gAmiMultiLangSupportProtocolGuid
+B295BD1C-63E3-48E3-B265-F7DFA2070123,AmiMultiLanSupportProtocolGuid
 B2A191A9-9BAC-4C83-A2F3-D5F6E71EFD03,ArmPlatformSysConfigLibNull
 B2CD74DE-11F9-418C-BF2E-DAC3035AAB7A,IsPlatformSupportWhea
 B2DEDC91-D59F-48D2-898A-12490C74A4E0,EfiIfrBootMaintenanceGuid
-B2FA4764-3B6E-43D3-91DF-87D15A3E5668,gAmiAhciBusProtocolGuid
-B2FA5764-3B6E-43D3-91DF-87D15A3E5668,gAmiAhciSmmProtocolGuid
+B2FA4764-3B6E-43D3-91DF-87D15A3E5668,AmiAhciBusProtocolGuid
+B2FA5764-3B6E-43D3-91DF-87D15A3E5668,AmiAhciSmmProtocolGuid
 B30DFEED-947F-4396-B15A-DFBDB916DC24,EdkiiPeiSdMmcHostControllerPpiGuid
 B323179B-97FB-477E-B0FE-D88591FA11AB,PeCoffLoaderProtocolGuid
-B326872A-4DC2-4DB3-88B2-F6C4475F8C91,gCpuConfigGuid
+B326872A-4DC2-4DB3-88B2-F6C4475F8C91,CpuConfigGuid
 B336F62D-4135-4A55-AE4E-4971BBF0885D,RealTimeClock
 B347F047-AF8C-490E-AC07-0AA9B7E53858,EfiWinNtSystemConfigGuid
-B34ADD50-05D4-4C99-BC55-F3F2F7F52E1A,file_LegacyToEfi
+B34ADD50-05D4-4C99-BC55-F3F2F7F52E1A,LegacyToEfi
 B34E5765-2E04-4DAF-867F-7F40BE6FC33D,ExtFs
 B35AD166-FCBA-4D4D-89C7-4B47104E3AFD,AppleSpiIoSkl
 B3738534-9051-40D1-9333-91284A5990CE,AmiPciHotPlugLibNull
 B3762FA2-54D6-4EBC-84DE-4CFA9340FCB3,AcpiAMLDxe
 B38573B6-6200-4AC5-B51D-82E65938D783,RecoveryOnFatIdeDiskGuid
-B3903068-7482-4424-BA4B-405F8FD7654E,gSiPolicyHobGuid
+B3903068-7482-4424-BA4B-405F8FD7654E,SiPolicyHobGuid
 B3930571-BEBA-4FC5-9203-9427242E6A43,EfiBluetoothHcProtocolGuid
 B3B0654A-969D-4096-86CB-27E262A02083,PeiCoreEntryPoint
 B3B88F4B-7042-488E-A255-66F965E8D435,PasswordPopupDxe
 B3BFAB9B-9F9C-4E8B-AD37-7F8C51FC6280,EfiPeiI2cMasterPpiGuid
-B3C14FF3-BAE8-456C-8631-27FE0CEB340C,gScEspiSmiDispatchProtocolGuid
+B3C14FF3-BAE8-456C-8631-27FE0CEB340C,ScEspiSmiDispatchProtocolGuid
 B3D3502E-CB82-4017-AB34-2F17D2D7035F,PepBccdSmm
-B3E123D0-7A1E-4DB4-AF66-BED41E9C6638,gScDeviceTableHobGuid
+B3E123D0-7A1E-4DB4-AF66-BED41E9C6638,ScDeviceTableHobGuid
 B3F56470-6141-4621-8F19-704E577AA9E8,DriverSampleInventoryGuid
 B3F79D9A-436C-DC11-B052-CD85DF524CE6,EfiRegularExpressionProtocolGuid
 B40612B2-A063-11D4-9A3A-0090273FC14D,UsbCbi1Dxe
@@ -2774,20 +2773,20 @@ B494DF39-A5F8-48A1-B2D0-EF523AD91C55,PeiPolicyInit
 B4C26857-8FE5-42BE-968B-39F45E921D45,AppleDxePState
 B4DE05C0-1BD0-11E1-8F0E-77F34724019B,TbtOemBoard
 B4E0CDFC-30CD-4B29-A445-B0AA95A532E4,SmmAccessPei
-B4E58F43-730A-46D7-B15F-1E06203EFC28,gBxtRefCodePkgTokenSpaceGuid
+B4E58F43-730A-46D7-B15F-1E06203EFC28,BxtRefCodePkgTokenSpaceGuid
 B50AB2CA-48D0-11E4-A6D3-B8E8562CBAFA,SerialMojoDxe
 B535ABF6-967D-43F2-B494-A1EB8E21A28E,AppleRomInformation
 B540A530-6978-4DA7-91CB-7207D764D262,FastBootVariableGuid
 B55A4515-5895-4EA8-845B-75B7480F6502,SmmControl2OnSmmControlThunk
 B579B530-C797-4839-883E-EFCABD7756E9,VerbTable
 B57A1DF6-FFDB-4247-A3DF-3A562176751A,UefiDebugLibStdErr
-B57EC3FE-F833-4BA6-8578-2A7D6A87444B,gEfiSpiNorFlashProtocolGuid
-B58A69FE-163E-4CC0-A487-304D34D5489F,gEfiTcgMADriverHobGuid
+B57EC3FE-F833-4BA6-8578-2A7D6A87444B,EfiSpiNorFlashProtocolGuid
+B58A69FE-163E-4CC0-A487-304D34D5489F,EfiTcgMADriverHobGuid
 B5A05743-9B71-489B-A0ED-A0EB3950D23B,SecPeiDxeTimerLibCpu
 B5AF1D7A-B8CF-4EB3-8925-A820E16B687D,BootScriptDataBootTimeGuid
 B5B35764-460C-4A06-99FC-77A17C1B5CEB,EfiPciOverrideProtocolGuid
-B5E7C7AF-A3E7-4D3C-B217-04596E4C368F,gAmiRedFishSecBootApiGuid
-B5F33FB5-66D5-4901-BAF1-F0C774FC6588,file_VgaDriverPolicy
+B5E7C7AF-A3E7-4D3C-B217-04596E4C368F,AmiRedFishSecBootApiGuid
+B5F33FB5-66D5-4901-BAF1-F0C774FC6588,VgaDriverPolicy
 B601F8C4-43B7-4784-95B1-F4226CB40CEE,RuntimeDxe
 B60A3E6B-18C4-46E5-A29A-C9A10665A28E,EfiI2cIoProtocolGuid
 B60DC6E8-3B6F-11D5-AF09-00A0C944A05B,EfiSalMcaInitPmiProtocolGuid
@@ -2803,17 +2802,17 @@ B6C0DCB6-434E-4BEC-BDAC-8EE7ED8A4EC8,ArithChk
 B6C1C466-E78A-4202-801A-B7950E956E0B,ProjectDXE
 B6C9FA82-9B26-4BE9-8C40-87A370E48365,AmiPlatformWrapperPei
 B6E9A733-EB75-41B6-B30C-009BCF3801C8,BasePostCodeLibPort80
-B6EC423C-21D2-490D-85C6-DD5864EAA674,gPeiBaseMemoryTestPpiGuid
+B6EC423C-21D2-490D-85C6-DD5864EAA674,PeiBaseMemoryTestPpiGuid
 B6F44CC0-9E45-11DF-BE21-0002A5D5C51B,MmcDxe
 B703C820-4D3D-4658-8EED-5B2F9DE54711,efi_pop_LF_pressed
 B709EFA0-47A6-4B41-B931-12ECE7A8EE56,EfiSmmPowerButtonDispatchProtocolGuid
 B7139637-C114-447C-B73E-CDBCD307BEBB,WinCSMDxe
 B716A6F8-F3A1-4B8E-8582-5A303F1CDD64,PchSpiWrap
-B723EFF4-EE4A-40BD-BD7B-22272E36B3E7,gObbyFirmwareFileSystemFvGuid
-B733C141-E88F-4786-94AF-8B87BC4867FE,gPttSsdtAcpiTableGuid
+B723EFF4-EE4A-40BD-BD7B-22272E36B3E7,ObbyFirmwareFileSystemFvGuid
+B733C141-E88F-4786-94AF-8B87BC4867FE,PttSsdtAcpiTableGuid
 B7358BEB-6A52-4D50-98F9-7EDD70B4B320,CommonPciPlatformDxe
-B73FE497-B92E-416E-8326-45AD0D270092,gIbbrFirmwareFileSystemFvGuid
-B74E676E-3B2E-483F-9458-C378FE0AC69F,gTcm32FileGuid
+B73FE497-B92E-416E-8326-45AD0D270092,IbbrFirmwareFileSystemFvGuid
+B74E676E-3B2E-483F-9458-C378FE0AC69F,Tcm32FileGuid
 B7611005-1F26-45BA-A3DB-01F39DDB2785,BootMode
 B7A5041A-78BA-49E3-B73B-54C757811FB6,IdeBusPei
 B7A5041B-78BA-48E3-B63B-44C7578113B6,FloppyPeimPei
@@ -2825,10 +2824,10 @@ B7DFB4E1-052F-449F-87BE-9818FC91B733,EfiRuntimeArchProtocolGuid
 B7E329EC-AD60-4D61-86E3-01A7904E223D,gear7
 B7EE4835-84CE-4B15-BF52-2D11574CE470,HardwareSignatureEntry
 B7F50E91-A759-412C-ADE4-DCD03E7F7C28,XhciDxe
-B81BFAB0-0EB3-4CF9-8465-7FA986361664,gEfiUfsDeviceConfigProtocolGuid
+B81BFAB0-0EB3-4CF9-8465-7FA986361664,EfiUfsDeviceConfigProtocolGuid
 B8502C59-B268-4BE8-ADD6-601AFEAA4BC9,SpiKeyboard
-B850A139-BABB-4D91-9F27-72D2EF01BF3A,gVbtMipiJdiGuid
-B859281C-16FA-45A8-9201-1C3830A973BD,GUID_DRVR_GecUpdateSMI
+B850A139-BABB-4D91-9F27-72D2EF01BF3A,VbtMipiJdiGuid
+B859281C-16FA-45A8-9201-1C3830A973BD,GecUpdateSMI
 B85C7FEA-AEBF-492B-96C6-42EA133BCF29,AmiTseHddSecurity
 B894C949-A1F8-41C1-A7C0-DF523AD91C15,MrcOemHooksPeim
 B8969637-81DE-43AF-BC9A-24D98913F2F6,HandleParsingHiiGuid
@@ -2840,14 +2839,14 @@ B8E62775-BB0A-43F0-A843-5BE8B14F8CCD,BootGraphicsResourceTableDxe
 B8FE3D49-DCF3-4CBB-8070-47B4F5A34559,GopDebugDxe
 B90510C4-A6DE-4E45-A50C-A46CCAFEEF91,BaseBoardDXE
 B912F198-7F0E-4803-B908-B757B806EC83,AppleImg4VerificationDxe
-B91547F5-4D24-4EEF-8507-74DDABEB71AD,gAmiSmmNvmePassThruProtocolGuid
+B91547F5-4D24-4EEF-8507-74DDABEB71AD,AmiSmmNvmePassThruProtocolGuid
 B91978DF-9FC1-427D-BB05-4C828455CA27,EfiSioControlProtocolGuid
 B9237513-6C44-4411-A990-21E556E05ADE,EfiKmsFormatGeneric3072Guid
 B95E9FDA-26DE-48D2-8807-1F9107AC5E3A,UefiPxeBcDxe
 B981A835-6EE8-4F4C-AE0B-210AA0BFBF01,RngDxe
 B9846521-FF99-4953-8FA2-85C9ADCCE5AF,PeiGfxDriver
 B98999A4-E96F-475A-99FC-762126F50F5A,SMBIOSUpdateData
-B9B038B0-E2B6-4AAB-9435-4165ECFED032,gAmiTsePasswordPromptExitGuid
+B9B038B0-E2B6-4AAB-9435-4165ECFED032,AmiTsePasswordPromptExitGuid
 B9B20B00-2FE5-8445-ACC5-8E29EF01A3E6,AppleMemoryTest
 B9C464F5-E8DF-49FB-8FE5-86DA958D8133,ASRockHDAudioDxe
 B9D4C360-BCFB-4F9B-9298-53C136982258,EfiFormBrowser2ProtocolGuid
@@ -2855,7 +2854,7 @@ B9E0ABFE-5979-4914-977F-6DEE78C278A6,EfiPeiLoadFilePpiGuid
 B9F10C17-6CA0-40B5-9B44-6253CFC7D24B,GdbDebugAgent
 BA05B97C-8EBF-48B7-858D-4B0AFBF0D7DA,BiosGuardRecoveryWorker
 BA102EAD-5308-4F9B-9E22-C1CE4DC44F49,RSAKey
-BA23B311-343D-11E6-9185-5820B1D65299,gEfiHttpBootCallbackProtocolGuid
+BA23B311-343D-11E6-9185-5820B1D65299,EfiHttpBootCallbackProtocolGuid
 BA246BC7-7E2F-4AE4-817A-FFDE572E39DE,AppleSmc2
 BA51887A-BEB9-45DA-8E37-98A6B46E7C58,IeHeciInit
 BA5B13F3-8B83-4871-8C3D-44CE683EAC1E,AmtLibPei
@@ -2863,10 +2862,10 @@ BA658945-DEE1-42B3-9FA4-BB6B22FB03E4,efi_pop_mid
 BA67550C-3628-4137-A53E-42660E081604,MePlatformPolicy
 BA73672C-A5D3-11D4-BD00-0080C73C8881,EfiWinNtConsoleGuid
 BA7BE337-6CFB-4DBB-B26C-21EC2FC16073,SecCore
-BA7C46D1-9C5E-4FC8-943D-1A491F23FE01,gAmiIso9660MediaGuid
+BA7C46D1-9C5E-4FC8-943D-1A491F23FE01,AmiIso9660MediaGuid
 BA87DD62-AB60-46DE-8FD8-023510D52D11,gear12
 BA929954-35B0-4DD3-90CD-9634BD7E1CF1,ResetDxe
-BAAEAD09-02A0-4131-9E0D-BC529EF0FF2A,gEfiTcgMpDriverHobGuid
+BAAEAD09-02A0-4131-9E0D-BC529EF0FF2A,EfiTcgMpDriverHobGuid
 BAB4F20F-0981-4B5F-A047-6EF83BEEAB3C,EhciPei
 BAE7599F-3C6B-43B7-BDF0-9CE07AA91AA6,CpuIoDxe
 BAF1E6DE-209E-4ADB-8D96-FD8B71F3F683,EfiEventUserProfileChangedGuid
@@ -2879,17 +2878,17 @@ BB3BF734-D640-4CF5-AFEA-CA8CFA6020D1,ASUS_USBFLASHBACK
 BB5B5907-5F8E-42AD-915D-5D98B52ED697,PlatformStage2
 BB62E663-625D-40B2-A088-BBE83623A245,EfiEapManagementProtocolGuid
 BB65942B-521F-4EC3-BAF9-A92540CF60D2,SataController
-BB6CBEFF-E072-40D2-A6EB-BAB75BDE87E7,gTcgPlatformSetupPolicyGuid
+BB6CBEFF-E072-40D2-A6EB-BAB75BDE87E7,TcgPlatformSetupPolicyGuid
 BB83F95F-EDBC-4884-A520-CD42AF388FAE,BaseDebugLibSerialPort
 BB8C2CF3-A5E3-49EF-941B-4A01FAC6FD5F,SmiFlashDxe
 BB929DA9-68F7-4035-B22C-A3BB3F23DA55,SataControllerDriverGuid
 BB983CCF-151D-40E1-A07B-4A17BE168292,EfiMemoryOverwriteRequestControlLockGuid
 BB9C7AB7-B8D9-4BF3-9C29-9BF341E217BC,EfiPlatformCpuInfoGuid
 BBB31581-855A-44D7-A550-8A585D9B2DE9,BaseCryptLibRuntimeCryptProtocol
-BBB810BB-5EF0-4E8F-B298-AD74AA50EF0A,gEfiTcgWakeEventDataHobGuid
+BBB810BB-5EF0-4E8F-B298-AD74AA50EF0A,EfiTcgWakeEventDataHobGuid
 BBCB6F85-303C-4EB9-8182-AF98D4B3020C,Tpm2DeviceLibTrEE
 BBCFF46C-C8D3-4113-8985-B9D4F3B3F64E,FspBootLoaderTemporaryMemoryGuid
-BC05DC37-9DA0-4050-9728-F34DDB01E200,file_BiosRegionLock
+BC05DC37-9DA0-4050-9728-F34DDB01E200,BiosRegionLock
 BC0B9FB8-97CF-4B17-9A9E-F574E62CBCC4,BmcLanConfig
 BC1A046C-7DBD-41F2-94E5-D7595554CAF4,SystemFirmwareReportDxe
 BC2B7672-A48B-4D58-B39E-AEE3707B5A23,Tpm12DeviceLibDTpm
@@ -2916,7 +2915,7 @@ BD44F629-EAE7-4198-87F1-39FAB0FD717E,FspEventEndOfFirmwareGuid
 BD712601-082F-4C59-8677-2C8A3C297948,LoadFileOnFv2
 BD7E9A27-D6C5-416A-B245-5F507D95B2BD,WinNtBusDriverDxe
 BD87394D-465C-40A9-9657-FBED21789860,BinConvert
-BD88EC68-EBE4-4F7B-935A-4F666642E75F,gEfiAcpiEnDispatchProtocolGuid
+BD88EC68-EBE4-4F7B-935A-4F666642E75F,EfiAcpiEnDispatchProtocolGuid
 BD8C1056-9F36-44EC-92A8-A6337F817986,EfiEdidActiveProtocolGuid
 BD9320EB-7BB9-4AED-A682-CF4F96BE244C,IntelMchFieldAcpiTables
 BDA39D3A-451B-4350-8266-81AB10FA0523,PeiDxeDebugLibReportStatusCode
@@ -2930,7 +2929,7 @@ BDFE5FAA-2A35-44BB-B17A-8084D4E2B9E9,FvbServicesRuntimeDxe
 BE0FEABA-3443-4919-9F3A-2D4216329EA9,WinNtAutoScan
 BE189D38-C963-41CF-B695-D90E9E545A13,UfsBlockIoPei
 BE216BA8-38C4-4535-A6CA-5DCA5B43ADDF,SmiVariable
-BE2DB903-B7C2-4ABC-8F64-B06E705D27E7,GUID_DRVR_PostWave
+BE2DB903-B7C2-4ABC-8F64-B06E705D27E7,PostWave
 BE731247-5FA2-4D5B-9DB6-5385CCCD59E1,UsbOcUpdateDxeLightningRidgeEXECB3
 BEA39084-044A-4C88-8763-2BFAFFA8950C,LTEB
 BF0A78BA-EC29-49CF-A1C9-7AE54EAB6A51,EfiMtftp6ProtocolGuid
@@ -2951,15 +2950,15 @@ C07A1EB5-5C04-4100-817B-0A11BB5F15DC,CppcDxe
 C095791A-3001-47B2-80C9-EAC7319F2FA4,EfiFirmwarePerformanceGuid
 C0A2EC40-7CA9-4FF7-A17C-08B81D70DE80,ECSmmFramework
 C0CC43BD-C920-4064-935B-93B447379470,PowerManagementAcpiTableStorageGuid
-C0EC00FD-C2F8-4E47-90EF-9C8155285BEC,gTcgNvramHobGuid
+C0EC00FD-C2F8-4E47-90EF-9C8155285BEC,TcgNvramHobGuid
 C10194E7-DEB2-4AF4-9EEE-BFFDE4D7D4C7,TimestampDxe
 C118F50D-391D-45F4-B3D3-11BC931AA56D,DsdtAsl
 C128CADC-623E-4E41-97CB-A7138E627460,BaseFspSecPlatformLibNull
 C12A7328-F81F-11D2-BA4B-00A0C93EC93B,EfiPartTypeSystemPartGuid
 C12C4E6A-BC3D-4A91-8299-7E0A4D5B5289,SmcOemID
 C144476F-F118-4C84-A936-417C8AFBD437,GenericUSBDebugger
-C153205A-E898-4C24-8689-A4B4BCC5C8A2,gPeiCachePpiGuid
-C184562C-6864-40A3-A081-C8D35E82B920,gWinCeGuid
+C153205A-E898-4C24-8689-A4B4BCC5C8A2,PeiCachePpiGuid
+C184562C-6864-40A3-A081-C8D35E82B920,WinCeGuid
 C18B8105-AB89-44DE-8D37-50B31FAE5D1E,SgTpvAcpiS3Save
 C194C6EA-B68C-4981-B64B-9BD271474B20,PchSpiRuntime
 C19783FD-E21E-451A-830E-C7CB23DB52CC,menu_mid_left
@@ -2969,27 +2968,27 @@ C1C418F9-591D-461C-82A2-B9CD96DFEA86,IntelLegacyInterrupt
 C1D61CB0-78B0-42F0-BC3F-F54DFEC65DB2,PartialMirrorHandler
 C1DBFAE7-D47A-4D0D-83B5-9E6F4162D15C,EXFAT
 C1E63AC4-D0CF-4CE6-835B-EED0E6A8A45B,EfiPaddingRsaesOaepGuid
-C1E6791D-F35B-43EF-920A-BE06BA7F86A1,gAmiTcgPlatformPpiBeforeMem
+C1E6791D-F35B-43EF-920A-BE06BA7F86A1,AmiTcgPlatformPpiBeforeMem
 C1E9FFFB-5557-4CB5-A5F5-1FBD902A74ED,LibIIO
 C1FBD624-27EA-40D1-AA48-94C3DC5C7E0D,SBPEI
 C1FCD448-6300-4458-B864-28DF015364BC,EfiPeiLoadedImagePpiGuid
 C21CF0E2-6ABC-4C3B-9DE6-3ABA8C3F83C9,DxeIchSmbus
 C2239ACD-21D0-4CB0-B7DB-6D35EE7B0CC1,FirmwareRevisionSyncPei
 C22E6B8A-8159-49A3-B353-E84B79DF19C0,VARIABLE
-C246FBBF-F75C-43F7-88A6-B5FD0CF1DB7F,gAmiDbtFileGuid
+C246FBBF-F75C-43F7-88A6-B5FD0CF1DB7F,AmiDbtFileGuid
 C2702B74-800C-4131-8746-8FB5B89CE4AC,EfiSmmAccess2ProtocolGuid
 C280C73E-15CA-11DA-B0CA-001083FFCA4D,EfiAuthenticationChapLocalGuid
 C2891AB9-9D96-475D-BE55-9EDF18F4D5EF,UsbIrq
 C2998CC8-A0AA-46E6-A634-EE32BF113188,AmtDriverPeimPei
 C2A743FE-9951-4299-9817-71DB147570D9,SmmPlatformDxe
-C2AD1A7F-D9DF-4638-8DAC-015996C88857,gScPolicyHobGuid
+C2AD1A7F-D9DF-4638-8DAC-015996C88857,ScPolicyHobGuid
 C2C79FD0-313C-4C4D-B9F1-ED26F00CA955,XhciDxe
 C2F9AE46-3437-4FEF-9CB1-9A568B282FEE,FspSecCoreM
 C3069C81-6717-4FB6-B646-04214894BAB4,SmcSwSmiFlashDxe
 C30B94E3-C8F2-4AB0-91AB-FA8DF621B1C9,MnpDxe
 C3158ABD-DB62-460F-B64C-FC258BB94A83,BiosLiveUpdateDxe
 C31A6189-639A-458B-B040-D7D506CA8F4F,GetHostByAddr
-C3253C90-A24F-4599-A664-1F8813778FC9,gArmGlobalVariableGuid
+C3253C90-A24F-4599-A664-1F8813778FC9,ArmGlobalVariableGuid
 C32A66D5-D8B7-2640-B768-082C8F083C37,ThunkPpiToProtocolPei
 C35F272C-97C2-465A-A216-696B668A8CFE,UserProfileManagerGuid
 C3811036-710B-4E39-8CF1-0AF9BE3A8198,TimerDxe
@@ -3002,9 +3001,9 @@ C41E9862-D078-4E7D-9062-00E3FAC34C19,AsusEcPei
 C41F8C82-B3E6-47E0-A61D-0F9E429E6996,DebugCommunicationLibUsb3Dxe
 C4491F51-66B9-4590-95E4-E2B4AD777703,HeciSmm
 C463CEAC-FC57-4F36-88B7-356C750C3BCA,UhciPei
-C46ACCBC-5765-40E3-87D2-82A568AC991B,gPcieRpConfigGuid
-C48D651C-9D0E-4CE7-AD39-EDD1AB836B30,gAmiTseAfterFirstBootOptionGuid
-C498F432-B8B7-44BF-86D3-7B36F2EC1390,gIFWIVersionHobGuid
+C46ACCBC-5765-40E3-87D2-82A568AC991B,PcieRpConfigGuid
+C48D651C-9D0E-4CE7-AD39-EDD1AB836B30,AmiTseAfterFirstBootOptionGuid
+C498F432-B8B7-44BF-86D3-7B36F2EC1390,IFWIVersionHobGuid
 C4A58D6D-3677-49CB-A00A-9470765FB55E,AddPerfRecordProtocolGuid
 C4B50EB2-ED16-4283-A5B0-A7341C3F997B,ArmTrustedMonitorLibNull
 C4B8C7FB-D2E2-441C-BAD6-E5D46B1E1AA6,T23HookResetSystem
@@ -3019,47 +3018,47 @@ C516673C-6C71-4F0E-83B5-57FC662376EC,LibPosix
 C51711E7-B4BF-404A-BFB8-0A048EF1FFE4,EfiIp4ServiceBindingProtocolGuid
 C5184932-DBA5-46DB-A5BA-CC0BDA9C1435,EfiHashProtocolGuid
 C522E695-93FF-4AC7-8220-F849C68C538F,APMDXE
-C53C63B4-39C1-4185-BC9B-0FE9722A0C60,gSmrrEnableHobGuid
+C53C63B4-39C1-4185-BC9B-0FE9722A0C60,SmrrEnableHobGuid
 C54B425F-AA79-48B4-981F-998B3C4B641C,TrEEConfigFormSetGuid
 C54F4B67-E527-4379-BF61-193C7A68C661,menu_none
 C56EDB22-3D78-4705-A222-BDD6BD154DA0,TpmClearOnRollbackSmm
 C5753963-3B84-4095-BF78-EDDAD3F9C9DD,EfiPciBusErrorSectionGuid
 C57AD6B7-0515-40A8-9D21-551652854E37,Shell
 C5847038-FF75-4074-9E4C-C36A2EB398A5,LibTime
-C58B7F84-FFA7-4112-8097-C765CF7515C8,file_OemGetEdid
+C58B7F84-FFA7-4112-8097-C765CF7515C8,OemGetEdid
 C5B9C74A-6D72-4719-99AB-C59F199091EB,SemihostFs
 C5D3191B-27D5-4873-8DF2-628136991A21,UserIdentifyManager
 C5F25542-2A79-4A26-81BB-4EA63233B309,EdkiiNonDiscoverableNvmeDeviceGuid
 C6068612-B6E0-48A3-BB92-60E4A4F89EDF,UefiPciSegmentLibPciRootBridgeIo
-C60AA7F6-E8D6-4956-8BA1-FE26298F5E87,gEpcBiosDataGuid
+C60AA7F6-E8D6-4956-8BA1-FE26298F5E87,EpcBiosDataGuid
 C613EC78-63ED-4B93-ACD4-54B3D4CCC268,NetworkLockerDxe
 C61EF796-B50D-4F98-9F78-4F6F79D800D5,MemoryInit
 C62CEB80-FB40-4A46-A5E5-C1D997C36DFC,CapsuleLoaderTriggerDxe
 C62F4B20-681E-11DF-8F0D-0002A5D5C51B,PciHostBridge
 C642C14C-0E9C-4AEF-94A5-A213BAA35DE0,HstiResultDxe
 C65A623F-2768-4700-BE2C-1D8BA2C43998,Inside
-C6734411-2DDA-4632-A592-920F24D6ED21,gAmiAtaPassThruInitProtocolGuid
+C6734411-2DDA-4632-A592-920F24D6ED21,AmiAtaPassThruInitProtocolGuid
 C6760651-A38D-5F4F-AEAF-F6661549DF75,EmuBlockIo
 C68DAA4E-7AB5-41E8-A91D-5954421053F3,CbSupportDxe
 C68ED8E2-9DC6-4CBD-9D94-DB65ACC5C332,EfiSmmCommunicationProtocolGuid
 C6A957E4-8303-4761-A084-92C0692D90F9,PoofAnimationState3
 C6BB86C0-16F5-4535-953E-E6C7CB6E4CB6,FpgaErrorHandler
-C74233C1-96FD-4CB3-9453-55C9D77CE3C8,file_WM00WMISmmHandler
+C74233C1-96FD-4CB3-9453-55C9D77CE3C8,WM00WMISmmHandler
 C74D1B0B-91B1-484A-A038-FE7A0847AA07,DualBiosDxe
-C74E5DB2-FA96-4AE2-B399-15977FE3002D,gEfiSpiHcProtocolGuid
+C74E5DB2-FA96-4AE2-B399-15977FE3002D,EfiSpiHcProtocolGuid
 C7542254-A8F7-40BA-9BB9-390D31977775,OCMR_PEI
-C7715FBC-E2AB-4A33-840F-5DCD0198E552,gSaDxeMiscConfigGuid
-C7735A2F-88F5-4882-AE63-FAAC8C8B86B3,EfiVgaMiniPortProtocolGuid
+C7715FBC-E2AB-4A33-840F-5DCD0198E552,SaDxeMiscConfigGuid
+C7735A2F-88F5-4882-AE63-FAAC8C8B86B3,EfiVAminiPortProtocolGuid
 C776AEA2-AA27-446E-975B-E0BEA9078BD9,BiosGuardPeiApRecoveryCapsule
 C779F6D8-7113-4AA1-9648-EB1633C7D53B,CapsulePei
-C77DD102-1DB4-4997-AE37-4E8C521EF567,AmiProcessTcgSetupGuid
+C77DD102-1DB4-4997-AE37-4E8C521EF567,AmiProcessTcSetupGuid
 C7A7030C-C3D8-45EE-BED9-5D9E76762953,MouseDriver
 C7B7070B-E5A8-4B86-9110-BDCA1095F496,PeiFspHobProcessLibSample
-C7C89169-1A42-4E5E-B34B-E6830671C9A6,GUID_DRVR_AmdSb900Smm
+C7C89169-1A42-4E5E-B34B-E6830671C9A6,AmdSb900Smm
 C7D35798-E4D2-4A93-B145-54889F02584B,EdkiiNonDiscoverableAhciDeviceGuid
 C7D4BBCF-EB0A-4C91-BD8B-FCA99F28B011,AmiTxtPei
 C7D4F4E3-DAEA-40B0-8846-F4CAF3135CE8,BiosProtectDxe
-C7DCFF6F-6F2A-4DC1-91C6-DF0BAFDBDA46,gVbtMipiSharpGuid
+C7DCFF6F-6F2A-4DC1-91C6-DF0BAFDBDA46,VbtMipiSharpGuid
 C7DF48CC-063E-4FD4-B775-75C00D9F19F6,SmbusDebugPei
 C7E6800D-9566-1143-81A8-B8C566AF3556,SNP
 C7EA9787-CA0A-43B4-B1E5-25EF87391F8D,QncS3Support
@@ -3078,9 +3077,9 @@ C8B64E46-9819-45AB-875D-09DFDA6D8B1B,Firewire
 C8CA0BB8-67DA-4883-8CFC-9180CB9EEC68,OemActivation
 C8F23B39-C95C-4318-9233-53FB3AC44592,VariableVsr
 C9122295-56ED-4D4E-06A6-508D894D3E40,FspApiPerformanceGuid
-C91C3C17-FC74-46E5-BDBE-6F486A5A9F3C,gAmiRomLayoutFfsFileGuid
-C95E6A28-FB95-49F2-AE01-F38166FD4524,file_OemServicesDriver
-C9737920-C2AD-41C3-B133-0F9C251B6743,gPeiDebugDispatchPpiGuid
+C91C3C17-FC74-46E5-BDBE-6F486A5A9F3C,AmiRomLayoutFfsFileGuid
+C95E6A28-FB95-49F2-AE01-F38166FD4524,OemServicesDriver
+C9737920-C2AD-41C3-B133-0F9C251B6743,PeiDebugDispatchPpiGuid
 C99E42D0-4964-4B09-B924-4A59E13E4F04,SbRunSmm
 C9A6DE36-FDFF-4FAF-8343-85D9E3470F43,NvmeInt13
 C9E057D7-3B6D-475C-B8C2-7C955D2F58B3,gear4
@@ -3090,11 +3089,11 @@ CA1BCAD9-E021-4547-A1B0-5B22C7F687F4,ACPIOSFRModelStringVariableGuid
 CA261A26-7718-4B9B-8A07-5178B1AE3A02,DiskIoDxe
 CA3668C7-AE4E-454B-9E46-DA97AAAE0FF5,X11SmmDriver
 CA37BC1F-A327-4AE9-828A-8C40D8506A17,EfiDns6ProtocolGuid
-CA3B3A50-5698-4551-8B18-CEAEEF917D50,gDxeDebugCmdProtocolGuid
+CA3B3A50-5698-4551-8B18-CEAEEF917D50,DxeDebugCmdProtocolGuid
 CA4233AD-847E-4E5D-AD3F-21CABFE5E23C,WinNtOemHookStatusCodeHandlerDxe
 CA452C68-DF0C-45C9-82FB-EAE42B312946,EfiVLVTokenSpaceGuid
 CA452C6A-DF0C-4DC9-82FB-EAE2AB312946,EfiQuarkNcSocIdTokenSpaceGuid
-CA4853F4-E94B-42B4-8642-CDE28A7FAC2D,gPeiTpmPpiGuid
+CA4853F4-E94B-42B4-8642-CDE28A7FAC2D,PeiTpmPpiGuid
 CA49B5C8-E977-4612-8706-91B82CD14C87,IntelMchAcpiTables
 CA515306-00CE-4032-874E-11B755FF6866,DataHubStdErrDxe
 CA5627C4-51BA-4DCB-AC62-C076EBD37DDB,Python
@@ -3102,17 +3101,17 @@ CA599759-90A7-4FE4-BC8B-4B71C350DCAC,LibGen
 CA5A1928-6523-409D-A9FE-5DCC87387222,TrEEPei
 CA5D7EB0-1B67-4B0B-964A-F2A861F0D640,IccOverclockingDxe
 CA5E3DF0-940A-48F1-8C14-DB2FB5998B36,TdtWrapper
-CA89914D-2317-452E-B245-36C6FB77A9C6,gSaSsdtAcpiTableStorageGuid
+CA89914D-2317-452E-B245-36C6FB77A9C6,SaSsdtAcpiTableStorageGuid
 CA9D8617-D652-403B-B6C5-BA47570116AD,TxtPei
 CAA4381E-750C-4770-B870-7A23B4E42130,EfiHashAlgorithmSha512Guid
 CAB0E94C-E15F-11E3-918D-B8E8562CBAFA,EfiBootManagerPolicyConsoleGuid
 CAC3FB95-33F5-4596-818B-68E024DDB67B,IsSecRecoveryPEI
 CACB3817-81E6-497E-87FF-C8FA8F24EC28,SgACPI
-CAD40D6E-C871-4398-910D-2D74EE94711A,gAmiTseAfterTimeOutGuid
+CAD40D6E-C871-4398-910D-2D74EE94711A,AmiTseAfterTimeOutGuid
 CAE0AD55-47B7-4E03-A714-95E1711CC279,BcpBootOrder
 CAEE2F3B-3191-4DA0-AD10-A5C07E636CD1,LibString
-CB2C0D12-8E6A-4B12-94F4-1BC49EC460B1,gAmiHstiPkgTokenSpaceGuid
-CB3FD86E-38A3-4C03-9A5C-90CFA3A2AB7A,EfiExtendedSalMcaLogServicesProtocolGuid
+CB2C0D12-8E6A-4B12-94F4-1BC49EC460B1,AmiHstiPkgTokenSpaceGuid
+CB3FD86E-38A3-4C03-9A5C-90CFA3A2AB7A,EfiExtendedSalMcaLoServicesProtocolGuid
 CB494BAD-23FF-427E-8608-D7E138D3363B,ArmPlatformLibNull
 CB49CE50-3A75-11DE-8A39-0800200C9A66,PerfTuneSmm
 CB537AA2-F727-440B-9702-ADE9D0A293F1,PlatformStage2Pei
@@ -3127,16 +3126,16 @@ CBF486B7-D196-4C03-AFE2-33F38E64DA16,IntegratedTouch
 CC0F8A3F-3DEA-4376-9679-5426BA0A907E,PkVar
 CC1BAA36-11EB-45CC-9ADC-7565E273AC70,PnpSmm
 CC1FC04E-0B3D-4E0E-AED7-5898541E2683,CSMLinkerDxe
-CC243581-112F-441C-815D-6D8DB3659619,file_D2DRecovery
+CC243581-112F-441C-815D-6D8DB3659619,D2DRecovery
 CC322E80-6A08-4E80-8BCA-01A84BA6CFE4,PciHostBridge2
 CC5263E8-9308-454A-89D0-340BD39BC98E,EfiEventNotificationTypeInitGuid
 CC54F583-3F9E-4AB0-9F7C-D2C7ED1C87A5,AppleRtcRam
 CC582C73-F48F-4B62-83E8-A586B4C88F84,AppleFirmwareFeatures
 CC664EB8-3C24-4086-B6F6-34E856BCE36E,EfiWinNtPassThroughGuid
-CC93A70B-EC27-49C5-8B34-13931EFED6E2,gEfiAlertStandardFormatProtocolGuid
+CC93A70B-EC27-49C5-8B34-13931EFED6E2,EfiAlertStandardFormatProtocolGuid
 CCA91175-03E3-442A-B3B8-2E4A335C1DEA,AmiHsti
-CCBF2786-CD6C-4308-BDFA-625870CEBF81,gAmiCmosAccessPpiGuid
-CCC4BC8A-0D71-4197-86D5-DD12E10A97E6,GUID_DRVR_InstantOn
+CCBF2786-CD6C-4308-BDFA-625870CEBF81,AmiCmosAccessPpiGuid
+CCC4BC8A-0D71-4197-86D5-DD12E10A97E6,InstantOn
 CCC5C136-ACD3-4251-9BDC-F663CD2297B7,AppleAudioDecoder
 CCCB0C28-4B24-11D5-9A5A-0090273FC14D,GraphicsConsoleDxe
 CCEC84CD-CDC5-4C75-8637-D4508FC79CCD,PngConvert
@@ -3161,7 +3160,7 @@ CE3DA938-6AD6-458A-8831-6B0A03DF6C86,Pentium4Base
 CE57B167-B0E4-41E8-A897-5F4FEB781D40,EdkiiSystemFmpCapsuleDriverFvFileGuid
 CE5E5929-C7A3-4602-AD9E-C9DAF94EBFCF,EfiIpSecConfigProtocolGuid
 CE660500-824D-11E0-AC72-0002A5D5C51B,HdLcdGraphicsDxe
-CE6F86BB-B800-4C71-B2D1-3897A3BC1DAE,gAmiHddSecurityInitProtocolGuid
+CE6F86BB-B800-4C71-B2D1-3897A3BC1DAE,AmiHddSecurityInitProtocolGuid
 CE76670A-55C0-484B-962E-84A2F65210A6,MEMPATCHPEI
 CE7CD764-A1D9-44E5-9857-14FEFAAE96DD,PnpDxe
 CE845704-1683-4D38-A4F9-7D0B50775793,EfiPlatformBootModeGuid
@@ -3178,16 +3177,16 @@ CF569F50-DE44-4F54-B4D7-F4AE25CDA599,XenIoPciDxe
 CF6BCADD-D4C4-4095-B2BC-417D7247890A,StaticSkuDataDxeNeonCityFPGA
 CF7A379E-F788-44D4-AF65-165CE1E0ED68,SmcOptimizeDxe
 CF8034BE-6768-4D8B-B739-7CCE683A9FBE,EfiPciHostBridgeResourceAllocationProtocolGuid
-CF89079D-DE55-4618-8683-BCFB0D5C90BC,GUID_DRVR_AsusSlp2Encrypt
+CF89079D-DE55-4618-8683-BCFB0D5C90BC,AsusSlp2Encrypt
 CF93C01F-1A16-4DFC-B8BC-9C4DAF67C104,EfiEventNotificationTypePcieGuid
-CFAA77CE-7208-43C3-B815-99E8D66A28BA,file_b57undix64
+CFAA77CE-7208-43C3-B815-99E8D66A28BA,b57undix64
 CFB33810-6E87-4284-B203-A66ABE07F6E8,EfiHeciProtocolGuid
-CFE5EC91-31ED-47E9-BE7D-9CCB59134B71,gSiSaPreMemPolicyPpiGuid
+CFE5EC91-31ED-47E9-BE7D-9CCB59134B71,SiSaPreMemPolicyPpiGuid
 CFFB32F4-C2A8-48BB-A0EB-6C3CCA3FE847,ApfsJumpStart
 D00752EA-A49C-40AD-A6DA-921C030C4B2F,DxeIchInitDxe
 D024BCD2-59EA-48AC-A17F-B3221EC23A11,Int15GetMisc
 D038747C-D00C-4980-B319-490199A47D55,FspReservedMemoryResourceHobTsegGuid
-D03F3A1D-088E-46C8-A9FB-8209770F2CE2,file_ChipsetPlatformLibServicesDxe
+D03F3A1D-088E-46C8-A9FB-8209770F2CE2,ChipsetPlatformLibServicesDxe
 D04159DC-E15F-11E3-B261-B8E8562CBAFA,EfiBootManagerPolicyNetworkGuid
 D0632C90-AFD7-4492-B186-257C63143C61,SmmBase
 D083E94C-6560-42E4-B6D4-2DF75ADF6A2A,EfiDataHubStatusCodeRecordGuid
@@ -3196,12 +3195,12 @@ D088A413-0A70-4217-BA55-9A3CB65C41B3,ExitPmAuthProtocolGuid
 D0893F05-B06D-4161-B947-9BE9B85AC3A1,SnpNt32Dxe
 D0CAA91E-2DE4-4B0D-B3DC-09C67E854E34,BiosSnp16
 D0CAF5CA-3DF0-3D4F-89C5-66105356D61B,AppleBds
-D0F71512-9E32-4CC9-A5A3-AD679A0667B8,gFlashProtectionConfigGuid
+D0F71512-9E32-4CC9-A5A3-AD679A0667B8,FlashProtectionConfigGuid
 D1150ED7-E582-4192-84A2-71B4EBA9A7C6,AcpiPlatformDxe
 D122882C-DA73-438B-A6B3-E07B7D18DB6F,FastBootSmi
 D124DFA7-D784-C64E-8106-29411A7F59DB,MnpDxe
-D1405D16-7AFC-4695-BB12-41459D3695A2,gEfiNetworkStackSetupGuid
-D18C0912-6825-4E8F-8D5A-AF7EEDB2E5BC,gLpssConfigGuid
+D1405D16-7AFC-4695-BB12-41459D3695A2,EfiNetworkStackSetupGuid
+D18C0912-6825-4E8F-8D5A-AF7EEDB2E5BC,LpssConfigGuid
 D1A26C1F-ABF5-4806-BB24-68D317E071D5,AppleEpidCertificate
 D1C17AA1-CAC5-400F-BE17-E2A2AE06677C,EfiKmsFormatMd4128Guid
 D1C4AAF9-AAB1-4AEE-ACAC-D68AEF05F0D5,UsraLibNull
@@ -3225,9 +3224,9 @@ D31F0400-7D16-4316-BF88-6065883B402B,EfiPchInfoProtocolGuid
 D3231048-B7D7-46FC-80F8-2F7B229586C5,UTDMUIApp
 D326D041-BD31-4C01-B5A8-628BE87F0653,EfiSmmFirmwareVolumeBlockProtocolGuid
 D3300D09-B70F-4315-9785-FE37209EFDCB,HddSecurityBdsCall
-D34D3234-38BA-428B-9ACD-84E830A80785,gAmiModulePkgTokenSpaceGuid
+D34D3234-38BA-428B-9ACD-84E830A80785,AmiModulePkgTokenSpaceGuid
 D359DE86-0A1B-47BC-95D2-1D1F8FFF0AD8,ChipsetSvcSmm
-D35EDA81-07D0-4142-9409-B07233ED2D07,gCseSpiSelectPpiGuid
+D35EDA81-07D0-4142-9409-B07233ED2D07,CseSpiSelectPpiGuid
 D36DDD2D-1C66-4210-B77A-2FD9F920E51F,ASUS_EUPSxSMI
 D3705011-BC19-4AF7-BE16-F68030378C15,EfiIntelFrameworkModulePkgTokenSpaceGuid
 D3709BB4-B194-4B71-B9C0-DBD8D2DA97AD,IntelIchLegacyInterruptDxe
@@ -3241,7 +3240,7 @@ D3B36F2D-D551-11D4-9A46-0090273FC14D,EfiStandardErrorDeviceGuid
 D3B46F3B-D441-1244-9A12-0012273FC14D,EfiXenInfoGuid
 D3ECC567-9FD5-44C1-86CF-5DA7A24F4B5D,EfiLpcWpc83627PolicyProtocolGuid
 D400D1E4-A314-442B-89ED-A92E4C8197CB,EfiQuarkCapsuleGuid
-D40B6B80-97D5-4282-BB1D-223A16918058,gEfiNvdimmLabelProtocolGuid
+D40B6B80-97D5-4282-BB1D-223A16918058,EfiNvdimmLabelProtocolGuid
 D42AE6BD-1352-4BFB-909A-CA72A6EAE889,LzmaF86CustomDecompressGuid
 D42F8F9A-9B96-4F47-B045-A8F3CD1FD9D3,SecureVariable
 D432A67F-14DC-484B-B3BB-3F0291849327,EfiDiskInfoProtocolGuid
@@ -3254,19 +3253,19 @@ D49D2EB0-44D5-4621-9FD6-1A92C9109B99,HiiResourcesSample
 D4A88838-EBF4-48D7-9D97-CE6789FDE0B7,CryptoPkgTest
 D4BECF5B-190D-46DB-92CC-3F5D74904DDA,SmmAccessDxe
 D4DCD37C-90A3-406E-B193-323C6AAC2428,ASUSBackup
-D4E79DAE-AAFC-4382-9540-3E3FA42D4255,gAmiNvmeLegacyProtocolGuid
-D4EE25EA-0B48-43AE-A016-4D6E8B6C43B3,MemoryInit_
+D4E79DAE-AAFC-4382-9540-3E3FA42D4255,AmiNvmeLegacyProtocolGuid
+D4EE25EA-0B48-43AE-A016-4D6E8B6C43B3,MemoryInit
 D5125E0F-1226-444F-A218-0085996ED5DA,Smbus
 D52B0965-681A-4DC6-92C6-B20A30208598,AAFTblPEI
 D52D8AD2-EA9A-470C-9E33-828FA591AB8D,AmiPeiHashInterfaceProtocolGuid
-D530CEA0-DD63-11DE-8A39-0800200C9A66,GUID_PEIM_MemSpd
-D5649ACA-DA40-4C58-A4DF-8E42EB40A180,gSaPolicyProtocolGuid
+D530CEA0-DD63-11DE-8A39-0800200C9A66,MemSpd
+D5649ACA-DA40-4C58-A4DF-8E42EB40A180,SaPolicyProtocolGuid
 D56A4094-570F-4D3D-8F5F-8D8AA0B396CB,EhciPei
 D57C852E-809F-45CF-A377-D77BC0CB78EE,IdeSmart
 D58EBCE1-AF26-488D-BE66-C164417F8C13,PciHostBridge
 D5919FF6-D708-4918-87A0-1BB21B157C08,CaseOpenDxe
 D5B06D16-2EA1-4DEF-98D0-A05D40728417,EfiWatchdogTimerDriverProtocolGuid
-D5B366C7-DB85-455F-B50B-900A694E4C8C,SlingShot
+D5B366C7-DB85-455F-B50B-900A694E4C8C,SlinShot
 D5D52FED-F8A6-49AC-97AC-7291A60405A6,FsIso9660
 D5E606EB-83DF-4E90-81E8-C3DB2F77179A,rmHwA15x2A7x3Guid
 D6062B50-15CA-11DA-9219-001083FFCA4D,EfiAuthenticationChapRadiusGuid
@@ -3277,24 +3276,24 @@ D62C96E9-D7D7-4D28-B0F9-BF2CA151DDEF,IePolicyInitPei
 D6405DAC-92D7-4BB2-A9C9-CB7C749023F5,BIOSLD
 D6494E1B-E06F-4AB5-B64D-48B25AA9EB33,SmmCpuPlatformHookLibNull
 D65D9F72-7BCE-4F73-A673-47AF446A1A31,SmmRuntimeDxeReportStatusCodeLibFramework
-D684FB08-8B0E-4CAF-8CFF-1EA386279809,file_SwitchableGraphicsSmm
-D69240C0-DD40-4F2D-9863-4848DA6E615F,gAmiTseInvalidPasswordGuid
-D69A279B-58EB-45D1-A148-771BB9EB5251,gEpcOsDataGuid
+D684FB08-8B0E-4CAF-8CFF-1EA386279809,SwitchableGraphicsSmm
+D69240C0-DD40-4F2D-9863-4848DA6E615F,AmiTseInvalidPasswordGuid
+D69A279B-58EB-45D1-A148-771BB9EB5251,EpcOsDataGuid
 D6A2CB7F-6A18-4E2F-B43B-9920A733700A,DxeCore
 D6A9928C-3397-4DD1-818F-C664BA6DCAAF,DevUtility
 D6A9A1B9-4BFD-D61E-F037-3FA4CA06E046,Lua
 D6AC4AC2-8BC2-4CDD-8776-280E1469DE02,PchPolicyInitDxe
 D6C589EA-DD29-49EF-97F6-1A9FE19A04E0,PwdCredentialProvider
 D6D2FBA6-EF60-4C38-A83E-6769814D23B0,CryptoPei
-D6EB696B-7EC3-4D1B-AA28-6775744C9EB5,gTSEScreenMgmtProtocolGuid
+D6EB696B-7EC3-4D1B-AA28-6775744C9EB5,TSEScreenMgmtProtocolGuid
 D6F43B1B-0F21-462B-B8B7-A033C3EB4261,BaseMemoryLibOptPei
 D6F76587-98CA-43DE-9E1A-59E60D0ABE73,AplFakeCapsulePei
 D719B2CB-3D3A-4596-A3BC-DAD00E67656F,EfiImageSecurityDatabaseGuid
 D71C8BA4-4AF2-4D0D-B1BA-F2409F0C20D3,UncoreInitPeim
 D71C9263-2E64-40F9-82B8-F25B27069D4F,EnePEI
-D71DB106-E32D-4225-BFF4-DE6D77871761,gPowerMgmtInitDoneProtocolGuid
+D71DB106-E32D-4225-BFF4-DE6D77871761,PowerMgmtInitDoneProtocolGuid
 D739F969-FB2D-4BC2-AFE7-081327D3FEDE,AMTDxe
-D74B7D80-4B7F-4A73-8A55-4B59D7DE747A,GUID_PEIM_AmdResetManager
+D74B7D80-4B7F-4A73-8A55-4B59D7DE747A,AmdResetManager
 D74CC5E6-B169-456E-91D2-BE2C2D1343A6,SpiFlashLibNull
 D77C900D-A1C7-41C5-B989-0C3D37FCA432,AmtWrapperDxe
 D79DF6B0-EF44-43BD-9797-43E93BCF5FA8,VlanConfigFormSetGuid
@@ -3303,13 +3302,13 @@ D7B10D4E-67E6-4C74-83E9-F9AF0ACC33CC,PchInitSmm
 D7C74207-A831-4A26-B1F5-D193065CE8B6,EfiAdapterInfoMediaStateGuid
 D7E31ECB-0A17-4529-9B84-C529DE8E1C0E,AcpiFvi
 D7E69789-1F68-45E8-96EF-3B6407A5B2DC,EfiKmsFormatAescbc256Guid
-D7E6ABC1-971B-461B-B5E4-3C3766267AD9,GUID_DRVR_SbInterfaceDxe
+D7E6ABC1-971B-461B-B5E4-3C3766267AD9,SbInterfaceDxe
 D8117CFE-94A6-11D4-9A3A-0090273FC14D,EfiDecompressProtocolGuid
-D8117CFF-94A6-11D4-9A3A-0090273FC14D,gEfiPeiPeCoffLoaderGuid
+D8117CFF-94A6-11D4-9A3A-0090273FC14D,EfiPeiPeCoffLoaderGuid
 D81D1706-BE6F-4734-B2AF-F885FFDCB16D,AsixUsbEthernetDxe
-D84BEFF0-159A-4B60-9AB9-AC5C474BD3B1,gAmiTseNVRAMUpdateGuid
+D84BEFF0-159A-4B60-9AB9-AC5C474BD3B1,AmiTseNVRAMUpdateGuid
 D872AEFA-7C5F-4C66-8836-AA57EFF0D9F8,IconGenericExternalHardDrive
-D8944553-C4DD-41F4-9B30-E1397CFB267B,gEfiNicIp4ConfigVariableGuid
+D8944553-C4DD-41F4-9B30-E1397CFB267B,EfiNicIp4ConfigVariableGuid
 D8A6F4A6-0E97-4A8B-A475-39F1B28B5AEC,Fv2OnFvThunk
 D8AAB432-93CC-48D2-9F34-3496CAF92185,SmartFanCtrlDXE
 D8AB1072-4B45-4828-837D-A4214377802E,BCLANDXE
@@ -3339,11 +3338,11 @@ DA964524-D0E5-4C32-90D0-010021CFB2DC,PMBUSDXE
 DA9F192F-BAE4-4F20-8C6C-55C1ACDE80B0,menu_checked
 DAA55048-BC3F-4DD9-999B-F58ABF2BBFCC,DxePlatform
 DAC2B117-B5FB-4964-A312-0DCC77061B9B,Font
-DAC3CB98-2295-412E-826D-FDEEA320CF31,gAmiRecoveryImageHobGuid
+DAC3CB98-2295-412E-826D-FDEEA320CF31,AmiRecoveryImageHobGuid
 DACF705C-71DF-497D-AABE-10186B2E1DDE,Recovery
 DADE1003-1B31-4FE4-8557-26FCEFC78275,InjectorKext
 DADE8301-CB29-4FD5-8148-56FD246C5B88,UefiApplicationEntryPoint
-DAEEAFC8-D2A8-4D9F-B093-3438984E5FDD,gAmiDeviceGuardSecBootApiGuid
+DAEEAFC8-D2A8-4D9F-B093-3438984E5FDD,AmiDeviceGuardSecBootApiGuid
 DAF4BF89-CE71-4917-B522-C89D32FBC59F,SMBiosStaticData
 DAF7B0E6-32DE-4619-B63A-2B9173A75B14,GetNetByName
 DB08F6CA-3048-4CD8-9B1F-20BED33ECFE7,StatusCodeSmm
@@ -3351,22 +3350,22 @@ DB1C3561-4F9E-4748-A807-BCBE7FA92FC9,EzConfig
 DB47D7D3-FE81-11D3-9A35-0090273FC14D,EfiFileSystemVolumeLabelInfoIdGuid
 DB4E8151-57ED-4BED-8833-6751B5D1A8D7,ConnectConInEventGuid
 DB63592C-B8CC-44C8-918C-51F534598A5A,PchResetProtocolGuid
-DB73174E-E46A-4927-9947-CF2DBEAF1681,gPowerMgmtConfigGuid
+DB73174E-E46A-4927-9947-CF2DBEAF1681,PowerMgmtConfigGuid
 DB8AF09A-34E3-4A7B-8225-8C5B0C059EB8,AppleSmc
 DB9A1E3D-45CB-4ABB-853B-E5387FDB2E2D,EfiLegacyBiosProtocolGuid
 DBA6A7E3-BB57-4BE7-8AF8-D578DB7E5687,EfiTscFrequencyGuid
-DBAB39F4-8FF1-45B8-B92B-107848AC07E7,file_CMFCSmmHook
-DBADD769-E86A-4819-8120-E991792C0BC1,gVbtMipiAuoGuid
-DBB5F303-214D-41C4-BEA3-A1B56A42DA8B,file_IsaAcpiDriver
+DBAB39F4-8FF1-45B8-B92B-107848AC07E7,CMFCSmmHook
+DBADD769-E86A-4819-8120-E991792C0BC1,VbtMipiAuoGuid
+DBB5F303-214D-41C4-BEA3-A1B56A42DA8B,IsaAcpiDriver
 DBC6381F-5554-4D14-8FFD-76D787B8ACBF,IpmiProtocolGuid
-DBC9FD21-FAD8-45B0-9E78-27158867CC93,gBdsAllDriversConnectedProtocolGuid
+DBC9FD21-FAD8-45B0-9E78-27158867CC93,BdsAllDriversConnectedProtocolGuid
 DBD5B6BA-6734-4C5D-BF53-2C210D93A012,IsctSmm
-DBDA3714-78BF-43FF-B30B-4BD3DBC01B54,gPsmiMotBufferGuid
+DBDA3714-78BF-43FF-B30B-4BD3DBC01B54,PsmiMotBufferGuid
 DBE23AA9-A345-4B97-85B6-B226F1617389,EfiTemporaryRamSupportPpiGuid
 DBE37563-AFEF-4B41-BDCE-B01B6D1E8690,Tpm12DeviceLibInfineonI2c
-DBFAB6C3-6C4B-4E4F-A8FE-AD1C27D5E8BA,file_OFCSmmDriver
+DBFAB6C3-6C4B-4E4F-A8FE-AD1C27D5E8BA,OFCSmmDriver
 DBFF9D55-89B7-46DA-BDDF-677D3DC0241D,EfiAcpiSupportProtocolGuid
-DC14E697-775A-4C3B-A11A-EDC38E1BE3E6,gAmiCsmOpromPolicyProtocolGuid
+DC14E697-775A-4C3B-A11A-EDC38E1BE3E6,AmiCsmOpromPolicyProtocolGuid
 DC2CD8BD-402C-4DC4-9BE0-0C432B07FA34,UefiFrameBufferInfoGuid
 DC3641B8-2FA8-4ED3-BC1F-F9962A03454B,Mtftp4Dxe
 DC38DF16-8280-49C1-B253-D7DBB301CF78,UserCredentialPwdDxe
@@ -3393,14 +3392,14 @@ DDADFC93-FBC5-4389-B20F-EC99E4A6AE52,SmmLibNull
 DDB412A6-E3F3-4E9E-90A3-2A991270219C,iFfsDxePolicyInit
 DDCBCFBA-8EEB-488A-96D6-097831A6E50B,HashLibBaseCryptoRouterPei
 DDCF3616-3275-4164-98B6-FE85707FFE7D,EfiVariableInfoGuid
-DDE31574-3589-4FA9-BC69-1729AF6FDA4E,gAmiNvramUpdateProtocolGuid
-DDFB5557-3E2E-4569-B459-BEFFE189B8B0,gAmiSmbiosFlashDataProtocolGuid
+DDE31574-3589-4FA9-BC69-1729AF6FDA4E,AmiNvramUpdateProtocolGuid
+DDFB5557-3E2E-4569-B459-BEFFE189B8B0,AmiSmbiosFlashDataProtocolGuid
 DE0EE9A4-3C7A-44F2-B78B-E3CCD69C3AF7,EfiExtendedSalBootServiceProtocolGuid
 DE141A05-FA40-432D-9631-5E3E990F44D5,SlotDataUpdateDxeNeonCityEPRP
 DE161CFE-1E60-42A1-8CC3-EE7EF0735212,EfiTpmMpDriverProtocolGuid
 DE23ACEE-CF55-4FB6-AA77-984AB53DE811,SaInitDxe
 DE23ACEE-CF55-4FB6-AA77-984AB53DE823,PchInitDxe
-DE24E0D1-FAEA-4906-9CC8-AC00BE3DFF3A,gAmiIbbrOBBHobGuid
+DE24E0D1-FAEA-4906-9CC8-AC00BE3DFF3A,AmiIbbrOBBHobGuid
 DE28BC59-6228-41BD-BDF6-A3B9ADB58DA1,FramerworkEfiFirmwareVolumeBlockProtocolGuid
 DE371F7C-DEC4-4D21-ADF1-593ABCC15882,ArmGicDxe
 DE3E049C-A218-4891-8658-5FC06A84C783,SBCbsPEIEntryPei
@@ -3420,10 +3419,10 @@ DF2D868E-32FC-4CF0-8E6B-FFD95D1343D0,EfiPrintProtocolGuid
 DF4F6190-42B8-4CA9-BA51-7A801B565F08,b57undix64
 DF5CD25A-8E55-46BA-8CDA-BC7DB7BF9C64,MdesStatusCodeDrv
 DF636282-5EED-11DF-A9D6-B334FBA24BB0,IntelHdAudioDxe
-DF66196C-958F-472F-9393-717D82110AF6,gAmiHashLogExtendExGuid
-DF73ABDA-7A42-4E5E-B34B-E6830671C9A6,GUID_DRVR_AmdSb900SmmDisp
+DF66196C-958F-472F-9393-717D82110AF6,AmiHashLogExtendExGuid
+DF73ABDA-7A42-4E5E-B34B-E6830671C9A6,AmdSb900SmmDisp
 DF8556F0-3A61-11DE-8A39-0800200C9A66,PerfTunePei
-DF8DE36D-D241-4947-87F1-36F9EDE545D8,GUID_DRVR_ASUSFS
+DF8DE36D-D241-4947-87F1-36F9EDE545D8,ASUSFS
 DF934DA3-CD31-49FE-AF50-B3C87C79325F,PlatformDebugLibIoPort
 DF9A9591-B646-4621-AF0D-18143A73289F,AppleLegacyBootFS
 DFA66065-B419-11D3-9A2D-0090273FC14D,EfiVT100Guid
@@ -3439,7 +3438,7 @@ E052D8A6-224A-4C32-8D37-2E0AE162364D,PchSmbusDxe
 E062C52D-78DC-4CC5-B246-B13497A8123C,PeiDxePostCodeLibReportStatusCode
 E0744B81-9513-49CD-8CEA-E9245E7039DA,EfiSmmGpiDispatchProtocolGuid
 E07A890D-7CC3-D042-A74B-12F117DDDF15,AppleGraphicsConsole
-E08CA6D5-8D02-43AE-ABB1-952CC787C933,gPeiDefaultVbtGuid
+E08CA6D5-8D02-43AE-ABB1-952CC787C933,PeiDefaultVbtGuid
 E0BEC4CC-8AE8-4D15-92E5-9755A08987BB,NCT3933UPEI
 E0C14753-F9BE-11D2-9A0C-0090273FC14D,EfiPcAnsiGuid
 E0D8CA17-4276-4386-BB79-48CB813D3C4F,EmbeddedTokenSpaceGuid
@@ -3451,7 +3450,7 @@ E11FACA0-4710-4C8E-A7A2-01BAA2591B4C,FdtClientProtocolGuid
 E121EC07-9C42-45EE-B0B6-FFF8EF03C521,AppleRtcRam
 E143C542-4FC4-4DD9-99F2-75715C44E41C,IePolicyInitDxe
 E1475E0C-1746-4802-862E-011C2C2D9D86,EfiRuntimeCryptProtocolGuid
-E159A956-3299-4EE9-9176-65181A4E5E9F,gAmiIdeBusInitProtocolGuid
+E159A956-3299-4EE9-9176-65181A4E5E9F,AmiIdeBusInitProtocolGuid
 E1628C66-2A2D-4DC5-BD41-B20F3538AAF7,BootPicker
 E16600D0-3C41-4798-B16A-0DBA67D2FC47,AmiCpuSmbios
 E18541CD-F755-4F73-928D-643C8A79B229,EfiNetworkInterfaceIdentifierProtocolGuid
@@ -3459,16 +3458,16 @@ E19E3D16-BC11-11E4-9CAA-C2051D5D46B0,EfiArmProcessorErrorSectionGuid
 E1AF9F5B-7CDE-4F98-91ED-5E67868282B8,BBVideo
 E1C1D0A9-40B1-4632-BDCC-D9D6E5295631,EfiPaddingRsaesPkcs1V1P5Guid
 E1CD9D21-0FC2-438D-9703-04E66D961E57,EfiExtendedSalPalServicesProtocolGuid
-E1CEE6E3-6C42-4A4F-916E-38385290A556,SnpDxe_
+E1CEE6E3-6C42-4A4F-916E-38385290A556,SnpDxe
 E1CF12E4-762B-4576-A158-9B255A828AA7,gear2
 E1E1685A-7ABC-450F-882A-4E692CC6AF7E,FpgaConfigDataDxeNeonCityFPGA
-E1E4A857-C970-4075-A4DA-E9C41B69ADFC,gAmiTextOutProtocolGuid
+E1E4A857-C970-4075-A4DA-E9C41B69ADFC,AmiTextOutProtocolGuid
 E1EB612F-1C6C-485D-9D06-650844881569,EfiSignedCapsulePkgTokenSpaceGuid
 E1F2EBA0-F7B9-4A26-8620-131221642A90,EfiPciCfgPpiInServiceTableGuid
 E20939BE-32D4-41BE-A150-897F85D49829,EfiMemoryOverwriteControlDataGuid
 E20BE735-E059-4CD5-A927-FF7D528EC650,DescriptorUpdate
 E21F35A8-42FF-4050-82D6-93F7CDFA7073,PiSmmCommunicationSmm
-E223CF65-F6CE-4122-B3AF-4BD18AFF40A1,gCpuInfoProtocolGuid
+E223CF65-F6CE-4122-B3AF-4BD18AFF40A1,CpuInfoProtocolGuid
 E227C522-D5FE-4A53-87B1-0FBE570F98E9,ObservableProtocolGuid
 E22BBCCA-516A-46A8-80E2-6745E83693BD,EdkiiSmmMemoryProfileGuid
 E23F86E1-056E-4888-B685-CFCD67C179D4,SBRun
@@ -3479,23 +3478,23 @@ E287D20B-D897-4E1E-A5D9-977763936A04,EfiPchS3SupportProtocolGuid
 E2A74738-8934-48F5-8412-99E948C8DC1B,SmbiosDmiEdit
 E2B36190-879B-4A3D-AD8D-F2E7BBA32784,EfiCertRsa2048Sha256Guid
 E2EA6F47-E678-47FA-8C1B-02A03E825C6E,TcgMorLockSmm
-E2EAE962-C492-4CA4-A11F-1A7CBB050A41,file_English
+E2EAE962-C492-4CA4-A11F-1A7CBB050A41,English
 E2ECA273-A1C0-407E-9A5C-F10C55142196,BaseSmbusLibNull
-E2F66EA2-0313-4B7E-A74F-8E23A6FEB449,gUfsPhyOverrideHobGuid
+E2F66EA2-0313-4B7E-A74F-8E23A6FEB449,UfsPhyOverrideHobGuid
 E3007647-798F-FF48-AC61-E0B8D1B66327,PlatformDataRegion
 E3441740-3B41-4C90-9C9D-964056C7417D,DxePciLibEsal
 E352725A-B84A-4EBC-A994-228E19224816,SmcBMCSMI
 E360BDBA-C3CE-46BE-8F37-B231E5CB9F35,FD_Drv_X64
 E364A338-2842-4F57-A7C7-CDC8CFDF6CD7,AppleEvent
 E3752948-B9A1-4770-90C4-DF41C38986BE,QemuVideoDxe
-E380280C-4C35-4AA3-B961-7AE489A2B926,gAmiSmbiosDynamicDataGuid
+E380280C-4C35-4AA3-B961-7AE489A2B926,AmiSmbiosDynamicDataGuid
 E3830347-4844-49F1-9570-18AA377B711C,AppleDiagnosticVault
 E38A1C3C-928C-4BF7-B6C1-7F0EF163FAA5,FlashDeviceLibRuntimeSmm
 E38C1029-E38F-45B9-8F0D-E2E60BC9B262,DisplayEngineGuid
 E38C11E3-968F-47B8-ACEF-ACC0693DB9FF,EfiIchTokenSpaceGuid
 E38CB52D-A74D-45DB-A8D0-290C9B21BBF2,UserProfileManager
-E3932A34-5729-4F24-9FB1-D7409B456A15,OemBadgingSupportDxe
-E3CACF62-3062-4E1D-978E-46807AB9747D,gPlatformConfigChangeGuid
+E3932A34-5729-4F24-9FB1-D7409B456A15,OemBadginSupportDxe
+E3CACF62-3062-4E1D-978E-46807AB9747D,PlatformConfigChangeGuid
 E3E4048D-6C0C-43E4-AE1C-FFB579D8EF41,OpalPasswordDxe
 E424C009-CD92-4FEC-8029-D79D3F1CF3DE,IntelIchReset
 E43176D7-B6E8-4827-B784-7FFDC4B68561,EfiRngAlgorithmRaw
@@ -3509,8 +3508,8 @@ E4A88140-8E28-461D-91BC-A90FF015717C,UsbOcUpdateDxeLightningRidgeEXRP
 E4C9411C-1268-404C-9E90-2573EF04F43F,StaticSkuDataDxeNeonCityEPECB
 E4ECD0B2-E277-4F2B-BECB-E4D75C9A812E,NBDXE
 E4F61863-FE2C-4B56-A8F4-08519BC439DF,VlanConfigDxe
-E516ACEF-FA3C-4068-8CE4-888D62B0E497,gAmiEfiCrbInfoProtocolGuid
-E51F643F-5F3C-4CFD-9126-4687305F18DA,gReadyToPxeBootGuid
+E516ACEF-FA3C-4068-8CE4-888D62B0E497,AmiEfiCrbInfoProtocolGuid
+E51F643F-5F3C-4CFD-9126-4687305F18DA,ReadyToPxeBootGuid
 E53734A3-E594-4C25-B1A2-081445650F7F,SmmChildDispatcher2
 E541B773-DD11-420C-B026-DF993653F8BF,EfiSmmSwDispatchProtocolGuid
 E54A3327-A345-4068-8842-70AC0D519855,Tpm2DeviceLibDTpm
@@ -3537,14 +3536,14 @@ E69562F2-C982-4E73-87B4-63BC79CDA110,CPLDDXE
 E6AF1F7B-FC3F-46DA-A828-A3B457A44282,EfiPeiCpuIoPpiInstalledGuid
 E6C2F70A-B604-4877-85BA-DEEC89E117EB,PchInitVariableGuid
 E6C7EBB7-1604-4FCB-8F87-B3A6F48730AE,OrderedCollectionTest
-E6DB4007-113B-4605-8F5F-668D7364C807,file_SmmInt15Service
+E6DB4007-113B-4605-8F5F-668D7364C807,SmmInt15Service
 E6DC9900-CCF6-452B-85FA-C7F1E52F0152,SlotDataUpdateDxeNeonCityEPECB
 E6F4F8F7-4992-47B2-8302-8508745E4A23,OemPir
 E6F930E0-BAE5-40E6-98C9-4CD2298278E7,IconNetworkVolume
 E6FF49A0-15DF-48FD-9ACF-D7DC271B39D5,UefiCorebootModulePkgTokenSpaceGuid
 E701458C-4900-4CA5-B772-3D37949F7927,StatusCodeCallbackGuid
 E706CB54-84B8-40BD-832F-7FB2D5CB87B3,FileExplorerLite
-E70E508F-4466-49F3-BBFB-FDF24E950DBC,gLockDownConfigGuid
+E70E508F-4466-49F3-BBFB-FDF24E950DBC,LockDownConfigGuid
 E72527CF-505B-4B50-99CD-A32467FA4AA4,AsfTable
 E7428F24-EF0C-4AE4-B521-9D247494900E,OnBrdDevOprom
 E764500B-E398-4AB7-BBBC-99A8E683681F,MeSmbios
@@ -3565,34 +3564,34 @@ E8C729FE-FB0A-4344-AD7E-48784116C9EF,SmmIpmiBmcInitialize
 E8DDEB8B-82D7-4B6E-A2B4-D5EAEC2B8976,IrsiRegistrationRuntimeDxe
 E8F56FFE-919C-4CC5-BA88-65ABE14913BB,EfiEventNotificationTypeMceGuid
 E8F6A75C-3CDA-4B00-9837-8CA2A1F34EAC,SpsDxe
-E8F8CCFB-E880-0361-BCD1-FE248B2A307E,file_SaveMemoryConfig
-E9008D70-2A4E-47EA-8EC4-72E25767E5EF,AmiBiosPpiFlagsManagementGuid
+E8F8CCFB-E880-0361-BCD1-FE248B2A307E,SaveMemoryConfig
+E9008D70-2A4E-47EA-8EC4-72E25767E5EF,AmiBiosPpiFlaSManagementGuid
 E92BAE14-3DFD-4C70-9FE6-3899F36C7846,PLEDSMM
 E92C4950-A483-445A-B6A8-B7029CA910AA,PlatformStage1Pei
 E9312938-E56B-4614-A252-CF7D2F377E26,AmiTcgPlatformPeiBeforeMem
-E938C9BE-CFC2-4A9D-A3CD-9653D8133009,gAmiChipsetModulePkgTokenSpaceGuid
+E938C9BE-CFC2-4A9D-A3CD-9653D8133009,AmiChipsetModulePkgTokenSpaceGuid
 E94CD42A-3AAD-4EA0-9B09-945891C60CCD,DxeIoLibCpuIo
 E94F54CD-81EB-47ED-AEC3-856F5DC157A9,PiSmmCore
 E954929C-5BAC-4494-B963-3B23D4A13AD2,QuiesceSupport
 E974833F-A4AE-4E39-BE37-8B6780DFAD01,Int15PanelFitting
 E98ADB03-B8B9-4AF8-BA20-26E9114CBCE5,EfiUserCredential2ProtocolGuid
-E998C6D8-572B-4E18-96CC-031EA3DD558C,gAmiOemCsm16BinaryGuid
+E998C6D8-572B-4E18-96CC-031EA3DD558C,AmiOemCsm16BinaryGuid
 E9CA4775-8657-47FC-97E7-7ED65A084324,EfiHiiFontProtocolGuid
 E9DB0D58-D48D-47F6-9C6E-6F40E86C7B41,PeiTpmInitializedPpiGuid
 E9DD7F62-25EC-4F9D-A4AB-AAD20BF59A10,StatusCodePei
 E9DEB2B3-88E4-46D2-B9A4-F60CACB918DC,SmcRiserCardPei
-E9F02217-2093-4470-8A54-5C2CFFE73ECB,gEfiSpiSmmHcProtocolGuid
+E9F02217-2093-4470-8A54-5C2CFFE73ECB,EfiSpiSmmHcProtocolGuid
 E9F05D70-9946-4AB9-A7F7-070E92C415BD,Int15BootTV
 E9F4B929-EE33-4B70-8E90-17D283AF508C,LibSoftfloat
 EA1D58A2-EA3D-4C14-928A-80A14545E681,WheaPlatformBoot
 EA296D92-0B69-423C-8C28-33B4E0A91268,PcdDataBaseHobGuid
 EA449C41-8236-4B97-9FF9-084E4BA70020,ProgressBarEmptyMiddle
-EA4B0675-1F36-4ABE-BB3A-6D60760A02A2,gAmiPciPortCompatibilityProtocolGuid
-EA4DAEE8-A851-4A9F-ABF4-B79FA2528291,GUID_DRVR_CpuSmbiosDriver
+EA4B0675-1F36-4ABE-BB3A-6D60760A02A2,AmiPciPortCompatibilityProtocolGuid
+EA4DAEE8-A851-4A9F-ABF4-B79FA2528291,CpuSmbiosDriver
 EA5D72C1-4455-4FF8-91A1-4352DC1EE112,gear8
-EA6D974D-AD75-40ED-BCDD-FDA297AA8F8A,file_ChipsetLibServicesDxe
+EA6D974D-AD75-40ED-BCDD-FDA297AA8F8A,ChipsetLibServicesDxe
 EA7CA24B-DED5-4DAD-A389-BF827E8F9B38,EfiPeiFirmwareVolumeInfo2PpiGuid
-EA7D60A6-1050-45E4-BEDF-BF177290D4B2,gEfiEmmcBootPartitionProtocolGuid
+EA7D60A6-1050-45E4-BEDF-BF177290D4B2,EfiEmmcBootPartitionProtocolGuid
 EAA006CD-3256-789B-BD20-EBABCD02583F,SecureFlashPei
 EAA96391-9BE3-4488-8AF3-B3E6EFD157D5,EmuSecPei
 EAD039A6-7390-411D-A9DE-E5294B25B897,ASUSEZFlash
@@ -3606,7 +3605,7 @@ EB5E4685-CA66-4769-B6A2-26068B001326,EfiPciDevErrorSectionGuid
 EB704011-1402-11D3-8E77-00A0C969723B,EfiMtcGuid
 EB740091-A494-44D7-8D96-C192F95A6394,OobTx
 EB97088E-CFDF-49C6-BE4B-D906A5B20E86,EfiAcpiSdtProtocolGuid
-EB98A90A-42EE-4A36-8DCC-AFA722C9CAB3,gAmiTcgPkgTokenSpaceGuid
+EB98A90A-42EE-4A36-8DCC-AFA722C9CAB3,AmiTcgPkgTokenSpaceGuid
 EB9D2D2F-2D88-11D3-9A16-0090273FC14D,EfiMpsTableGuid
 EB9D2D30-2D88-11D3-9A16-0090273FC14D,EfiAcpi10TableGuid
 EB9D2D31-2D88-11D3-9A16-0090273FC14D,EfiSmbiosTableGuid
@@ -3621,22 +3620,22 @@ EBF342FE-B1D3-4EF8-957C-8048606FF671,SetupBrowser
 EBF8ED7C-0DD1-4787-84F1-F48D537DCACF,DriverHealthManagerDxe
 EBFE50DA-14AE-4E5F-9E21-ADB76B320541,AppleMcaDumpDxe
 EC20EB79-6C1A-4664-9A0D-D2E4CC16D664,EfiTcp6ServiceBindingProtocolGuid
-EC2A6C28-2286-44ED-916B-243AB5253546,gSLP20MarkerVariableGuid
-EC2BD1FD-E3B0-429B-ADDF-9657935A3684,gAmiSmmNvmeCommunicationGuid
+EC2A6C28-2286-44ED-916B-243AB5253546,SLP20MarkerVariableGuid
+EC2BD1FD-E3B0-429B-ADDF-9657935A3684,AmiSmmNvmeCommunicationGuid
 EC2BEECA-E84A-445B-869B-F7A73C96F58A,LegacyRegion2Dxe
 EC2E931B-3281-48A5-8107-DF8A8BED3C5D,PlatformGOPPolicyGuid
 EC3A978D-7C4E-48FA-9ABE-6AD91CC8F811,EfiKmsProtocolGuid
-EC63428D-66CA-4BF9-82AE-840F6D5C2305,gAmiBoardPciInitProtocolGuid
+EC63428D-66CA-4BF9-82AE-840F6D5C2305,AmiBoardPciInitProtocolGuid
 EC835DD3-FE0F-617B-A621-B350C3E13388,EfiIp6ServiceBindingProtocolGuid
 EC87D643-EBA4-4BB5-A1E5-3F3E36B20DA9,EfiSetupVariableGuid
 EC8A3D69-6DDF-4108-9476-7337FC522136,EfiKmsFormatGeneric128Guid
 EC98FF95-242C-4513-B1BC-69FA24111C58,AcpiDebug
-ECA27516-306C-4E28-8C94-4E521096695E,gDxeSiPolicyProtocolGuid
+ECA27516-306C-4E28-8C94-4E521096695E,DxeSiPolicyProtocolGuid
 ECA2AE9E-7594-4901-871C-449DA1A11660,I2cDxe
-ECB54CD9-E5AE-4FDC-A971-E877756068F7,gEfiPramConfGuid
-ECB867AB-8DF4-492D-8150-A7FD1B9B5A75,gAmiSmmFlashProtocolGuid
+ECB54CD9-E5AE-4FDC-A971-E877756068F7,EfiPramConfGuid
+ECB867AB-8DF4-492D-8150-A7FD1B9B5A75,AmiSmmFlashProtocolGuid
 ECEBCB00-D9C8-11E4-AF3D-8CDCD426C973,HttpBootDxe
-ECFD4BCE-4279-40F8-BAF2-DCB79638D41E,gAmiTseOemPortingGuid1
+ECFD4BCE-4279-40F8-BAF2-DCB79638D41E,AmiTseOemPortingGuid1
 ED150714-DF30-407D-B24A-4B742FD5CEA2,DuetConsoleOutConfigGuid
 ED2DE537-7823-4CB1-B687-85BA9BBEF0B4,RaidRom
 ED32D533-99E6-4209-9CC0-2D72CDD998A7,EfiSmmVariableProtocolGuid
@@ -3646,7 +3645,7 @@ ED6E0531-F715-4A3D-9B12-C1CA5EF698A2,IntelFsp2PkgTokenSpaceGuid
 ED888C65-2D84-4595-9086-A15A1F66DE2B,EnableLsiDecoding
 ED8B5E2B-6622-4D14-9069-9BDEC54C9491,TcgPwdTseHook
 ED8DCDD5-D037-4B1F-98DD-BDFDAD4DD7DD,BatteryState4
-EDA2B104-7A10-4519-B0A1-EBA5C52ACFCE,gAmiTseOemPortingVar1Guid
+EDA2B104-7A10-4519-B0A1-EBA5C52ACFCE,AmiTseOemPortingVar1Guid
 EDA39402-F375-4496-92D3-83B43CB8A76A,SmBiosMemory
 EDADEB9D-DDBA-48BD-9D22-C1C169C8C5C6,CpuMpPei
 EDBEDF47-6EA3-4512-83C1-70F4769D4BDE,Capsule_A.fvi
@@ -3656,7 +3655,7 @@ EE0BFF80-2B33-4005-8EF1-3F9B23C25136,GetCpuInfoDxe
 EE0EA811-FBD9-4777-B95A-BA4F71101F74,PeiHeciPpiGuid
 EE16160A-E8BE-47A6-820A-C6900DB0250A,EfiPeiMpServicesPpiGuid
 EE1BB93E-54C5-4B17-9496-A20085950561,SmmUsbDispatch2OnSmmUsbDispatchThunk
-EE1DF00B-B4FE-4762-A330-1E8AB4D9149D,GUID_DRVR_ExtfTable
+EE1DF00B-B4FE-4762-A330-1E8AB4D9149D,ExtfTable
 EE4E5898-3914-4259-9D6E-DC7BD79403CF,LzmaCustomDecompressGuid
 EE685731-CFF3-4EE7-9388-7E63FC5A59B0,PlatformEarlyInit
 EE8367C0-A1D6-4565-8F89-EF628547B722,IpSecDxe
@@ -3666,7 +3665,7 @@ EE993080-5197-4D4E-B63C-F1F7413E33CE,CpuDxe
 EE9B8D90-C5A6-40A2-BDE2-52558D33CCA1,EfiSmmUsbDispatch2ProtocolGuid
 EEC25BDC-67F2-4D95-B1D5-F81B2039D11D,BootManagerMenuApp
 EED5EA31-38E2-463D-B623-2C57702B8A1C,SectionExtractionPei
-EEE07404-26EE-43C9-9071-4E48008C4691,gEfiWheaSupportProtocolGuid
+EEE07404-26EE-43C9-9071-4E48008C4691,EfiWheaSupportProtocolGuid
 EEEE611D-F78F-4FB9-B868-55907F169280,PlatformInitPreMem
 EEF749C2-C047-4D6E-B1BC-D36EB3A5559C,QuarkVariableLockGuid
 EF0C99B6-B1D3-4025-9405-BF6A560FE0E0,SmbiosMiscDxe
@@ -3678,7 +3677,7 @@ EF251B71-CEED-484E-82E3-3A1F34F512E2,EfiQuarkSCSocIdTokenSpaceGuid
 EF33C296-F64C-4146-AD04-347899702C84,SmmUsbLegacyDxe
 EF3468E0-1B0A-46D7-842C-928E67EFE0B8,X11DPHPeiDriver
 EF398D58-9DFD-4103-BF94-78C6F4FE712F,EfiPeiResetPpiGuid
-EF402953-B819-4CC2-A44C-4C9B4CFBC889,gAmiTseOemPortingVar2Guid
+EF402953-B819-4CC2-A44C-4C9B4CFBC889,AmiTseOemPortingVar2Guid
 EF598499-B25E-473A-BFAF-E7E57DCE82C4,TpmErrorHobGuid
 EF6619EE-F77D-4A8C-8693-D60D6AA56702,SetupSecurity
 EF7BF7D6-F8FF-4A76-8247-C0D0D1CC49C0,EfiSmbiosSlotPopulationGuid
@@ -3690,7 +3689,7 @@ EFCB2FDB-0662-4A59-A5D7-03033EA97CAE,GTSE
 EFD652CC-0E99-40F0-96C0-E08C089070FC,S3Restore
 EFEFD093-0D9B-46EB-A856-48350700C908,EfiHiiImageDecoderNameJpegGuid
 EFFC8F05-B526-4EB5-B36B-8CD889923C0C,LegacyRegion
-F01BED57-04BC-4F3F-9660-D6F2EA228259,gEfiLegacySpiFlashProtocolGuid
+F01BED57-04BC-4F3F-9660-D6F2EA228259,EfiLegacySpiFlashProtocolGuid
 F0384FFD-8633-452F-9010-F6B7D2EAE2F1,WinNtFirmwareVolumePei
 F05976EF-83F1-4F3D-8619-F7595D41E538,EfiPrint2ProtocolGuid
 F099D67F-71AE-4C36-B2A3-DCEB0EB2B7D8,WatchDogTimerDxe
@@ -3720,54 +3719,54 @@ F21173FE-DF86-4B8B-AFF9-C7CB77B9C7DD,PeiIchInit
 F22FC20C-8CF4-45EB-8E06-AD4E50B95DD3,EfiHiiDriverHealthFormsetGuid
 F24643C2-C622-494E-8A0D-4632579C2D5B,EfiTrEEPhysicalPresenceGuid
 F2765DEC-6B41-11D5-8E71-00902707B35E,Timer
-F276BDEC-6C41-21E5-9E71-00A13807B45E,file_RestoreMtrr
+F276BDEC-6C41-21E5-9E71-00A13807B45E,RestoreMtrr
 F282908A-A6F9-4E50-9D6C-210478F1ED46,FtBbUpdate
 F282DD45-CA7B-40EC-9618-99381C08F409,OpaPlatCfg
-F2A128FF-257B-456E-9DE8-63E7C7DCDFAC,gOpromStartEndProtocolGuid
+F2A128FF-257B-456E-9DE8-63E7C7DCDFAC,OpromStartEndProtocolGuid
 F2BA331A-8985-11DB-A406-0040D02B1835,EmuVirtualDisksGuid
 F2BDCC96-8985-11DB-8719-0040D02B1835,EmuPhysicalDisksGuid
 F2C1819D-10F5-4223-9236-9B4EBF1B9AE7,Logo1394
 F2C1910E-F5C9-4B72-B243-6D59096A79F0,EfiI2cSlaveProtocolGuid
 F2FBD108-8985-11DB-B06A-0040D02B1835,MiscSubclass
 F2FD1544-9794-4A2C-992E-E5BBCF20E394,EfiSmbios3TableGuid
-F3009649-36D6-4164-AA05-E72DEEA3722F,gEfiCseEndofServicesProtocolGuid
+F3009649-36D6-4164-AA05-E72DEEA3722F,EfiCseEndofServicesProtocolGuid
 F303AF22-6804-494B-A28A-A03BE7D5C742,CsmRt32Asm
 F30A4091-D9DF-478B-89F2-A266C1917985,OCMR_Setup
 F30C2915-5782-4E6A-A846-05BABCE7B6A0,EfiI2cAcpiProtocolGuid
-F3224A5E-17A3-47C2-A38B-481456863C74,gAmiSmmNvramUpdateProtocolGuid
+F3224A5E-17A3-47C2-A38B-481456863C74,AmiSmmNvramUpdateProtocolGuid
 F328E36C-23B6-4A95-854B-32E19534CD75,SmmCommunicateHeaderGuid
 F33261E7-23CB-11D5-BD5C-0080C73C8881,FrameworkEfiMpServiceProtocolGuid
 F3331DE6-4A55-44E4-B767-7453F7A1A021,MicrocodeUpdate
 F342BE75-274C-433C-A24D-2816F5433D50,VmwSmbios
 F3552032-8985-11DB-8429-0040D02B1835,RealTimeClock
 F35F733F-5235-4D7B-83FA-97780CEBCB20,Ping6
-F363B225-4D2C-4352-80CD-8EA4280F8DC0,file_OemEdidFromGop
+F363B225-4D2C-4352-80CD-8EA4280F8DC0,OemEdidFromGop
 F36FF770-A7E1-42CF-9ED2-56F0F271F44C,EfiManagedNetworkServiceBindingProtocolGuid
-F3714ADF-E3C3-473B-8FCC-5C34630C45C0,gComputeHmacSha256ProtocolGuid
+F3714ADF-E3C3-473B-8FCC-5C34630C45C0,ComputeHmacSha256ProtocolGuid
 F3749E2C-5139-4E7A-B53A-4F5080B68B8F,PciSerialDxe
 F3794B60-8985-11DB-8E53-0040D02B1835,Cpu
 F38C34DE-9C38-438C-9AF6-69F584F17EC0,PoofAnimationState4
 F3C9667B-C50C-4E9C-A1F1-78C3B1DDF2C2,LibNetUtil
 F3D301BB-F4A5-45A8-B0B7-FA999C6237AE,ShellNetwork1HiiGuid
 F3E4543D-CF35-6CEF-35C4-4FE6344DFC54,EfiFormCallbackProtocolGuid
-F3ED95DF-828E-41C7-BCA0-16C41965A634,gTcgPpiSyncFlagGuid
+F3ED95DF-828E-41C7-BCA0-16C41965A634,TcgPpiSyncFlagGuid
 F3FF1468-04BA-4966-9FB2-E4A790054650,EfiCapsuleCrashLogVarGuid
-F426C7CF-DEB9-0361-4D4E-9F298C1B896E,file_SavePlatformConfiguration
-F429C00A-9640-46B3-9544-F8F86A28F30F,gPlatformConfigChangeProtocolGuid
-F42A009D-977F-4F08-9440-BCA5A3BED9AF,gAmiExtPciBusProtocolGuid
-F42F7782-012E-4C12-9956-49F94304F721,gEfiConsoleControlProtocolGuid
+F426C7CF-DEB9-0361-4D4E-9F298C1B896E,SavePlatformConfiguration
+F429C00A-9640-46B3-9544-F8F86A28F30F,PlatformConfigChangeProtocolGuid
+F42A009D-977F-4F08-9440-BCA5A3BED9AF,AmiExtPciBusProtocolGuid
+F42F7782-012E-4C12-9956-49F94304F721,EfiConsoleControlProtocolGuid
 F44875AB-B9FC-4578-A280-AA335B49967C,CmosSmm
 F44C00EE-1F2C-4A00-AA09-1C9F3E0800A3,EfiArpServiceBindingProtocolGuid
 F46998C9-DD30-4C64-966C-E17777B2568A,AppleSmc
 F4731D79-537E-4505-BD52-C03F9B1F6B89,BaseTimerLibNullTemplate
 F479E147-A125-11D4-BCFC-0080C73C8881,WinNtBlockIoDxe
 F495F038-71E6-49DB-9A80-B2E98F7BA718,PeiDbgModuleLocator
-F4B2C007-94A1-4CD5-A710-F4141FCEBCA0,gAmiTseOemTSEVarGuid
+F4B2C007-94A1-4CD5-A710-F4141FCEBCA0,AmiTseOemTSEVarGuid
 F4B427BB-BA21-4F16-BC4E-43E416AB619C,EfiArpProtocolGuid
 F4CCBFB7-F6E0-47FD-9DD4-10A8F150C191,EfiSmmBase2ProtocolGuid
 F4EA205B-7345-452C-9D62-53BA6F3B8910,FmpAuthenticationLibPkcs7
 F4EF9D7A-98C5-4C1A-B4D9-D8D87265BE0C,PeiSdhcPpiGuid
-F4F63529-281E-4040-A313-C1D6766384BE,gAmiHddSecurityProtocolGuid
+F4F63529-281E-4040-A313-C1D6766384BE,AmiHddSecurityProtocolGuid
 F5042177-1D29-45C5-BA4D-4D0EB2E88575,IT8728SioAcBack
 F5089266-1AA0-4953-97D8-562F8A73B519,EfiUsbHcProtocolGuid
 F541796D-A62E-4954-A775-9584F61B9CDD,EfiTcgProtocolGuid
@@ -3780,12 +3779,12 @@ F5D14DB5-2F0C-4611-9DDC-7C182B173A71,ProgressBarEmptyRightEndcap
 F5E655D9-02A6-46F2-9E76-B8BE8E60AB22,EfiIfrRefreshIdOpGuid
 F5EF05E4-D538-4774-8F1B-E9773011E038,FspInitDonePpiGuid
 F5F219D3-7006-4648-AC8D-D61DFB7BC6AD,FontPackageListGuid
-F5F87B4F-CC3C-408D-89E3-61C59C5407C4,gSataConfigGuid
+F5F87B4F-CC3C-408D-89E3-61C59C5407C4,SataConfigGuid
 F617B358-12CF-414A-A069-60677BDA13B3,DxeIchPlatformPolicyProtocolGuid
 F617B358-12CF-414A-A069-60677BDA13B4,UsbPolicyGuid
-F6435590-2402-4E02-99FD-ABDD9DD40A6A,gSaPolicyPpiGuid
+F6435590-2402-4E02-99FD-ABDD9DD40A6A,SaPolicyPpiGuid
 F65354B9-1FF0-46D7-A5F7-0926CB238048,MonoStatusCodePei
-F655D0B3-615D-4022-9645-0D1F2E9DF78A,file_CMFCOEMSwSmi
+F655D0B3-615D-4022-9645-0D1F2E9DF78A,CMFCOEMSwSmi
 F65ABA32-76FD-49C6-A1C4-CD7FADF96659,AmiReportFvLibCompatibility
 F66447D4-75A6-463E-A819-077F2DDA05E9,EfiKmsFormatRsasha12048Guid
 F6697AC4-A776-4EE1-B643-1FEFF2B615BB,IncompatiblePciDeviceSupportDxe
@@ -3796,7 +3795,7 @@ F6A59595-BB9F-415B-A7F3-DC7C09387BE6,SmBusMemoryDown
 F6BEC3FE-88FB-11E3-AE84-E73B77561C35,FastbootTransportUsbDxe
 F6D35FBB-63EA-4B25-81A5-5E62B4886292,PlatformSetup
 F6EE6DBB-D67F-4EA0-8B96-6A71B19D84AD,EdkiiStatusCodeDataTypeVariableGuid
-F706D0C8-F6FC-4F7A-AC98-96BA5CC43AAA,file_SandyBridgeGopDriver
+F706D0C8-F6FC-4F7A-AC98-96BA5CC43AAA,SandyBridgeGopDriver
 F74D20EE-37E7-48FC-97F7-9B1047749C69,LogoDxe
 F75BD2CD-F473-4BA1-89B3-1E69EFC8BA70,ASUS_HW_FastBootDXE
 F76E0A70-B5ED-4C38-AC9A-E5F54BF16E34,DriverHealthFormSetGuid
@@ -3807,8 +3806,8 @@ F78153D0-870D-4EEE-A684-741499C9A8CE,EistDxe
 F78285FD-121E-49F4-9716-44E307656586,Python2710
 F7A1F48E-0F6A-4F12-A74D-ED6F5B6B00F2,OpromUpdateDxeLightningRidgeEXECB4
 F7AD60F8-EFA8-44A3-9113-231F399EB4C7,EfiKmsFormatMdc2128Guid
-F7B0E92D-AB47-4A1D-8BDE-41E529EB5A70,file_UnlockPswd
-F7CA7568-5A09-4D2C-8A9B-758468592AE2,gAmiNvramControlProtocolGuid
+F7B0E92D-AB47-4A1D-8BDE-41E529EB5A70,UnlockPswd
+F7CA7568-5A09-4D2C-8A9B-758468592AE2,AmiNvramControlProtocolGuid
 F7D22BCA-1BCA-5591-CC8B-1CA98F2890FE,AmiCpuS3Pei
 F7D6D25E-6243-4D5C-9BA5-C2DC48F003B0,AmiFlashLibPei
 F7D9FD14-9335-4389-80C5-334D6ABFCCED,ArmVirtPrePiUniCoreRelocatable
@@ -3837,9 +3836,9 @@ FA177FF7-1FC7-458D-A358-D9D62AE61CEC,PeimEntryPoint
 FA20568B-548B-4B2B-81EF-1BA08D4A3CEC,BootScriptExecutorDxe
 FA3AD693-D58A-4619-960B-8EE85C914870,PeiPciLibPciCfg2
 FA4585F1-303B-4725-80E4-BB42BBD0249C,SupportURL
-FA4974FC-AF1D-4E5D-BDC5-DACD6D27BAEC,gAmiNvramMainRomAreaGuid
+FA4974FC-AF1D-4E5D-BDC5-DACD6D27BAEC,AmiNvramMainRomAreaGuid
 FA528024-59A6-4689-BEA0-B555D87D7DBE,FpgaFvDataLibDxe
-FA7E8D10-1312-4B98-9A3B-3B5B13A25DB0,gPsmiHandlerBufferGuid
+FA7E8D10-1312-4B98-9A3B-3B5B13A25DB0,PsmiHandlerBufferGuid
 FA920010-6785-4941-B6EC-498C579F160A,VirtioDeviceProtocolGuid
 FAB5D4F4-83C0-4AAF-8480-442D11DF6CEA,VirtioScsiDxe
 FAB7E9E1-39DD-4F2B-8408-E20E906CB6DE,HdBootDevicePathVariablGuid
@@ -3861,7 +3860,7 @@ FB74A690-DE1A-4BF4-97C0-170B3535FC98,PciThunderbolt
 FB76E42B-EA77-48F3-A61D-208FF0535F92,TrEEPpVendorLibNull
 FB85101D-F422-4C8C-82C4-EF4DCD05E1BF,SmcSmBios
 FB925AC7-192A-9567-8586-7C6F5F710607,Cryptest
-FBA14D8B-BE6F-0361-93E8-4CDF18E19EDE,file_ICCPolicy
+FBA14D8B-BE6F-0361-93E8-4CDF18E19EDE,ICCPolicy
 FBA34BC8-4E37-451D-A7FF-5469F52064C6,UUDriver
 FBB4A01B-947E-4D82-B27D-1E207C070053,BaseCacheAsRamLibNull
 FBF95065-427F-47B3-8077-D13C60710998,dbVar
@@ -3872,7 +3871,7 @@ FC1BCDB0-7D31-49AA-936A-A4600D9DD083,EfiCrc32GuidedSectionExtractionGuid
 FC1D4706-88FB-42B0-98B0-A4B2E607EBAA,LibErr
 FC4285A7-EBB5-45D2-8541-EBA3318FC2C2,UsbOcUpdateDxeLightningRidgeEXECB1
 FC510EE7-FFDC-11D4-BD41-0080C73C8881,AprioriDxe
-FC53F573-17DD-454C-B067-ECB10B7D7FC7,gEfiHeciSmmProtocolGuid
+FC53F573-17DD-454C-B067-ECB10B7D7FC7,EfiHeciSmmProtocolGuid
 FC5C7020-1A48-4198-9BE2-EAD5ABC8CF2F,BdsDxe
 FC63ED62-949D-4FB0-B754-D558A6367C56,EzFlashDxe
 FC73690C-8D4A-4F8C-B7F5-BA241F316E28,CpuInitDxe
@@ -3883,7 +3882,7 @@ FCABE6A7-7953-4A84-B7EC-D29E89B62E87,EmbeddedMonotonicCounter
 FCCCE259-07E1-417A-A755-E0F2CF39295E,CpuInitDxe
 FCD337AB-B1D3-4EF8-957C-8048606FF670,HiiDatabaseDxe
 FCD6562A-253A-40D7-87DE-28CFF25898C6,InsideHT
-FCDCB9C2-7987-47DF-A9A7-BE3DBA52D50C,file_BootOptionPolicy
+FCDCB9C2-7987-47DF-A9A7-BE3DBA52D50C,BootOptionPolicy
 FCF94301-9763-4A64-AA84-7892C4712367,IpSecDxe
 FD023012-19F4-4235-ADCF-D924DBE246FE,StaticSkuDataDxeLightningRidgeEXECB1
 FD0C65EB-0405-4CD2-8AEE-F400EF13BAC2,NtPeiLoadFilePpiGuid
@@ -3898,15 +3897,15 @@ FD3B7E55-FA7B-4E07-AE1D-208B81FB0BAD,FvbRuntimeDxe
 FD3F690E-B4B0-4D68-89DB-19A1A3318F90,MICROCODE
 FD44820B-F1AB-41C0-AE4E-0C55556EB9BD,SMBiosFlashData
 FD5FBE54-8C35-B345-8A0F-7AC8A5FD0521,EmuSnpProtocolGuid
-FD72B1B5-5391-4C6A-BDFD-9F59A7880A21,gPlatformRelatedInfoGuid
+FD72B1B5-5391-4C6A-BDFD-9F59A7880A21,PlatformRelatedInfoGuid
 FD76FF8E-665F-4AFC-AF75-724EF5A569E5,UcOnUc2Thunk
-FD93F9E1-3C73-46E0-B7B8-2BBA3F718F6C,TCGSmm
-FDA14FA3-AFFC-469A-B7BB-34BCDD4AC096,file_PlatformIde
+FD93F9E1-3C73-46E0-B7B8-2BBA3F718F6C,TCSmm
+FDA14FA3-AFFC-469A-B7BB-34BCDD4AC096,PlatformIde
 FDC50ED1-ACB8-8048-8735-8098B7A13E5E,ApplePowerState
 FDFF263D-5F68-4591-87BA-B768F445A9AF,Tcg2Dxe
 FE3542FE-C1D3-4EF8-657C-8048606FF670,DriverSampleDxe
 FE3542FE-C1D3-4EF8-657C-8048606FF671,DriverSample
-FE4622E7-180F-4383-B6AF-87A18F049B4A,gFirmwareVolumesInstalledPpiGuid
+FE4622E7-180F-4383-B6AF-87A18F049B4A,FirmwareVolumesInstalledPpiGuid
 FE5CEA76-4F72-49E8-986F-2CD899DFFE5D,FaultTolerantWriteDxe
 FE612B72-203C-47B1-8560-A66D946EB371,setupdata
 FE61BB5F-1B67-4C24-B346-73DB42E873E5,ArmHwDxe
@@ -3916,8 +3915,8 @@ FED6583D-2418-4760-AC96-B5E18F0A6326,SmmCorePlatformHookLibNull
 FEDD6305-E2D7-4ED5-9FAA-DA080E336C22,PeiUsb2HostControllerPpiGuid
 FEDE0A1B-BCA2-4A9F-BB2B-D9FD7DEC2E9F,StatusCodeRuntimeDxe
 FEDF8E0C-E147-11E3-9903-B8E8562CBAFA,EfiBootManagerPolicyProtocolGuid
-FF052503-1AF9-4AEB-83C4-C2D4CEB10CA3,gPhoenixEfiSmmSwSmiProtocolGuid
-FF084F98-B1D2-49F8-AA57-E7EEE7C48A12,gVbtMipiPanel3Guid
+FF052503-1AF9-4AEB-83C4-C2D4CEB10CA3,PhoenixEfiSmmSwSmiProtocolGuid
+FF084F98-B1D2-49F8-AA57-E7EEE7C48A12,VbtMipiPanel3Guid
 FF0C8745-3270-4439-B74F-3E45F8C77064,IntelGopDriver
 FF11E702-8923-47CC-AD30-D9E0E240DD10,AAFTblDXE
 FF259F16-18D1-4298-8DD2-BD87FF2894A9,PchResetPeim
@@ -3925,6 +3924,6 @@ FF3E5307-9FD0-48C9-85F1-8AD56C701E01,EfiCertSha384Guid
 FF456B9C-0DC7-4682-9E92-0DE84B6E4067,PeiSmmControl
 FF478412-38C3-4770-85F6-5D076C62125F,TargetDiskModeUI
 FF917E22-A228-448D-BDAA-68EFCCDDA5D3,TxtDxe
-FFBD9AD2-F1DB-4F92-A649-EB9EEDEA86B5,gAmiHddSmartProtocolGuid
+FFBD9AD2-F1DB-4F92-A649-EB9EEDEA86B5,AmiHddSmartProtocolGuid
 FFE06BDD-6107-46A6-7BB2-5A9C7EC5275C,EfiAcpiTableProtocolGuid
 FFF12B8D-7696-4C8B-A985-2747075B4F50,EfiSystemNvDataFvGuid