diff --git a/common/guids.csv b/common/guids.csv
index f2dd9ff..1a098ea 100644
--- a/common/guids.csv
+++ b/common/guids.csv
@@ -309,7 +309,7 @@
 127C1C4E-9135-46E3-B006-F9808B0559A5,Slp20Markers
 128FB770-5E79-4176-9E51-9BB268A17DD1,PciHostBridgeDxe
 129F6AA7-AB69-4CB8-AED1-40985001115E,SerialMuxControl
-12AEDBEA-392D-4E2A-8789-5F6DC6B23661,OemBadginSupportDxe
+12AEDBEA-392D-4E2A-8789-5F6DC6B23661,OemBadgingSupportDxe
 12BFCA88-7A2F-4AB5-9A5D-C40CA68BF75F,BootOrderSection
 12C67BE1-AD2E-4F13-A95F-6EDC2C4392DE,MePolicyInitPei
 12CADD30-6007-4C83-89D7-FF237F7B947A,SetupCompleteRedrawGuid
@@ -724,7 +724,7 @@
 2BE1E4A6-6505-43B3-9FFC-A3C8330E0432,TcgPei
 2C03C536-4594-4515-9E7A-D3D204FE1363,EfiFileExplorerProtocolGuid
 2C181BE1-8BAC-4433-873C-E5074CB5A723,UbaConfigDatabasePei
-2C194230-54B6-4C95-B809-877E83309358,ASUSAmingBoard
+2C194230-54B6-4C95-B809-877E83309358,ASUSGamingBoard
 2C29929E-27CF-4DD5-BB97-E5525791F5BA,DRYDXE
 2C6B9CB7-A13B-4EEE-80C0-1A240C8A69EE,IccOverClocking
 2C6CACC6-6C3C-4AA7-B2DE-384DAE2B0352,RegAccessPeim
@@ -747,7 +747,7 @@
 2DA064D8-5A52-4DAC-B60F-54471A7FC372,CspFlashLibNull
 2DCBE49A-1E5B-486E-BC23-48156B8282C9,X11DxeDriver
 2DCE8BB1-BDD7-450E-B9AD-9CF4EBD4F890,EfiEventNotificationTypeCmcGuid
-2DDFEDFE-C2D5-43E3-9E10-46DB2C7C1F26,SmbiosEloSetupScreen
+2DDFEDFE-C2D5-43E3-9E10-46DB2C7C1F26,SmbiosElogSetupScreen
 2DE2AE4B-7489-4D91-9B63-9B12CC564540,A01DxeServiceBody
 2DE648CB-3102-43CA-A02E-42E38EA5E789,ProcessorErrorHandler
 2DEAE482-5796-40F2-8DF5-D87419D6F362,ASUSHDDPW
@@ -958,7 +958,7 @@
 3A35EE58-8286-4F00-9A5B-1B6AB7680815,amiFVhoblistguid
 3A4D7A7C-018A-4B42-81B3-DC10E3B591BD,UsbKeyboardLayoutKeyGuid
 3A4E4376-4871-4B0E-A02F-ED36F2AECD00,AmiCsmVideoPolicyProtocolGuid
-3A53114D-5673-4DD9-B5B3-CB72C347669B,BFSmm
+3A53114D-5673-4DD9-B5B3-CB72C347669B,BFGSmm
 3A61FD45-69A0-42AD-B261-24DA451BF442,ForceRecovery
 3A666558-43E3-4D25-9169-DB81F5DB42E1,PKeyFileX509Guid
 3AA83745-9454-4F7A-A7C0-90DBD02FAB8E,BdsConnectDriversProtocolGuid
@@ -1317,7 +1317,7 @@
 50A18017-37AD-8743-BCF2-DF1A8FF12FAB,EmuReset
 50B4FAD4-9D0D-440B-812C-D8E3EC21244D,XhciHandlerCommon
 50DC5C90-1D33-4FD6-87E5-063B1DFA2170,AmiSerialProtocolGuid
-50F6096D-7C98-4C78-9A1D-C5A1833B6A88,AmiTcgNvflaSample
+50F6096D-7C98-4C78-9A1D-C5A1833B6A88,AmiTcgNvflagSample
 510DF6A1-B6C1-4948-AEE7-59F220F898BD,SataController
 51116915-C34B-4D8E-86DB-6A70F2E60DAA,NVMe
 51116915-C34B-4D8E-86DB-6A70F2E60DAC,IOBufferCopyController
@@ -1372,7 +1372,7 @@
 547C5CAE-2640-4ACF-9532-0E25B3F03F05,WheaDxe
 54891A9E-763E-4377-8841-8D5C90D88CDE,TerminalSrc
 54975633-0945-4D9C-97C2-E0CC6469A5A3,MeLibPei
-54A85D82-3A54-4006-9C0E-E527295C4FA8,SetupLanService
+54A85D82-3A54-4006-9C0E-E527295C4FA8,SetupLangService
 54AB7A17-AD08-4F86-83C2-4CF398EBC0AD,AsusPostErrDxe
 54CE6010-2A6D-42AA-B1E2-FD97DE9C4DA8,AppleDebugSupportFireWireInit
 54D2878F-25CD-4A2B-8420-EBD18E609C76,OemHookStatusCodeLibNull
@@ -1414,7 +1414,7 @@
 57E56594-CE95-46AD-9531-3C49310CA7CE,OFBD
 57F48613-300A-4101-A76D-4F73C533B5B8,PriorBootDxe
 57F55732-CF55-43C7-B66B-216CE2282888,MonoStatusCodePei
-5802BCE4-EEEE-4E33-A130-EBAD27F0E439,MseSmramGuid
+5802BCE4-EEEE-4E33-A130-EBAD27F0E439,MsegSmramGuid
 58053681-13F3-47F6-B137-CDB3E888D9A4,ExtendedDataGuid
 580DD900-385D-11D7-883A-00500473D4EB,UHCD
 5810798A-ED30-4080-8DD7-B9667A748C02,HashInstanceLibSha256
@@ -2280,7 +2280,7 @@
 9042A9DE-23DC-4A38-96FB-7ADED080516A,EfiGraphicsOutputProtocolGuid
 905CF1B3-32F8-489C-A641-46A714583262,PcieErrorEnable
 905DC1AD-C44D-4965-98AC-B6B4444BFD65,UfsPciHcPei
-9069C144-0A7E-41EF-9C07-418BCA9BF939,AcpiDebuSmm
+9069C144-0A7E-41EF-9C07-418BCA9BF939,AcpiDebugSmm
 907125C0-A5F1-11E3-A3FE-A3198B49350C,FvSimpleFileSystem
 9073E4E0-60EC-4B6E-9903-4C223C260F3C,EfiVendorKeysNvGuid
 908C3852-B61B-4F26-AB66-F74F97E7DC1C,AMTbypass
@@ -2568,7 +2568,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,ASUSAmingBoard
+A0EAF572-69D8-4825-B1B0-9EE3B4C64FA7,ASUSGamingBoard
 A0EF80E3-F9AB-4CBA-98FD-704620F4048D,SecFlashUpdDxe
 A1147A20-3144-4F8D-8295-B48311C8E4A4,ArmJunoTokenSpaceGuid
 A11585B7-8FA2-4F1C-AA6F-DD6309469613,MEFwUpdLcl
@@ -2860,7 +2860,7 @@ 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,T23OwnerStrinService
+B26B30A8-2172-4A46-9B4F-4D5B08DD6E40,T23OwnerStringService
 B273CC44-E62A-41DC-9CAD-BDB4235459D8,UnicodeCollationDxe
 B295BD1C-63E3-48E3-B265-F7DFA2070123,AmiMultiLanSupportProtocolGuid
 B2A191A9-9BAC-4C83-A2F3-D5F6E71EFD03,ArmPlatformSysConfigLibNull
@@ -3189,7 +3189,7 @@ 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,AmiProcessTcSetupGuid
+C77DD102-1DB4-4997-AE37-4E8C521EF567,AmiProcessTcgSetupGuid
 C7A7030C-C3D8-45EE-BED9-5D9E76762953,MouseDriver
 C7B7070B-E5A8-4B86-9110-BDCA1095F496,PeiFspHobProcessLibSample
 C7C89169-1A42-4E5E-B34B-E6830671C9A6,AmdSb900Smm
@@ -3253,7 +3253,7 @@ CAD40D6E-C871-4398-910D-2D74EE94711A,AmiTseAfterTimeOutGuid
 CAE0AD55-47B7-4E03-A714-95E1711CC279,BcpBootOrder
 CAEE2F3B-3191-4DA0-AD10-A5C07E636CD1,LibString
 CB2C0D12-8E6A-4B12-94F4-1BC49EC460B1,AmiHstiPkgTokenSpaceGuid
-CB3FD86E-38A3-4C03-9A5C-90CFA3A2AB7A,EfiExtendedSalMcaLoServicesProtocolGuid
+CB3FD86E-38A3-4C03-9A5C-90CFA3A2AB7A,EfiExtendedSalMcaLogServicesProtocolGuid
 CB494BAD-23FF-427E-8608-D7E138D3363B,ArmPlatformLibNull
 CB49CE50-3A75-11DE-8A39-0800200C9A66,PerfTuneSmm
 CB537AA2-F727-440B-9702-ADE9D0A293F1,PlatformStage2Pei
@@ -3414,7 +3414,7 @@ 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,SlinShot
+D5B366C7-DB85-455F-B50B-900A694E4C8C,SlingShot
 D5D52FED-F8A6-49AC-97AC-7291A60405A6,FsIso9660
 D5E606EB-83DF-4E90-81E8-C3DB2F77179A,rmHwA15x2A7x3Guid
 D6062B50-15CA-11DA-9219-001083FFCA4D,EfiAuthenticationChapRadiusGuid