diff --git a/Tools/Conf/Migration/Library.csv b/Tools/Conf/Migration/Library.csv
index 958419cf37..758393fa05 100644
--- a/Tools/Conf/Migration/Library.csv
+++ b/Tools/Conf/Migration/Library.csv
@@ -38,7 +38,6 @@ EfiDriverLib,EfiCreateEventReadyToBoot,EfiCreateEventReadyToBootEx,UefiLib,MdePk
 EfiDriverLib,EfiCreateEventLegacyBoot,EfiCreateEventLegacyBootEx,UefiLib,MdePkg
 EfiDriverLib,EfiInitializeFwVolDevicepathNode,EfiInitializeFwVolDevicepathNode,UefiLib,MdePkg
 EfiDriverLib,EfiGetNameGuidFromFwVolDevicePathNode,EfiGetNameGuidFromFwVolDevicePathNode,UefiLib,MdePkg
-EfiDriverLib,EfiLibReportStatusCode,gRT->ReportStatusCode,ReportStatusCodeLib,MdePkg
 EfiDriverLib,ReportStatusCodeWithDevicePath,ReportStatusCodeWithDevicePath,ReportStatusCodeLib,MdePkg
 EfiDriverLib,EFI_FIELD_OFFSET,EFI_FIELD_OFFSET,BaseLib,MdePkg
 EfiDriverLib,EFI_LIST,LIST_ENTRY,BaseLib,MdePkg
diff --git a/Tools/Conf/Migration/Protocol.csv b/Tools/Conf/Migration/Protocol.csv
index b9b73c6f97..77d27dba1e 100644
--- a/Tools/Conf/Migration/Protocol.csv
+++ b/Tools/Conf/Migration/Protocol.csv
@@ -62,6 +62,7 @@ SimpleFileSystem,gEfiSimpleFileSystemProtocolGuid,gEfiSimpleFileSystemProtocolGu
 SimpleNetwork,gEfiSimpleNetworkProtocolGuid,gEfiSimpleNetworkProtocolGuid,A19832B9-AC25-11D3-9A2D-0090273FC14D,MdePkg
 SimplePointer,gEfiSimplePointerProtocolGuid,gEfiSimplePointerProtocolGuid,31878C87-0B75-11D5-9A4F-0090273FC14D,MdePkg
 SimpleTextIn,gEfiSimpleTextInProtocolGuid,gEfiSimpleTextInProtocolGuid,387477C1-69C7-11D2-8E39-00A0C969723B,MdePkg
+SimpleTextInputEx,gEfiSimpleTextInputExProtocolGuid,gEfiSimpleTextInputExProtocolGuid,dd9e7534-7762-4698-8c14-f58517a625aa,MdePkg
 SimpleTextOut,gEfiSimpleTextOutProtocolGuid,gEfiSimpleTextOutProtocolGuid,387477C2-69C7-11D2-8E39-00A0C969723B,MdePkg
 UgaDraw,gEfiUgaDrawProtocolGuid,gEfiUgaDrawProtocolGuid,982C298B-F4FA-41CB-B838-77AA688FB839,MdePkg
 UnicodeCollation,gEfiUnicodeCollationProtocolGuid,gEfiUnicodeCollationProtocolGuid,1D85CD7F-F43D-11D2-9A0C-0090273FC14D,MdePkg
@@ -124,11 +125,10 @@ SmmSwDispatch,gEfiSmmSwDispatchProtocolGuid,gEfiSmmSwDispatchProtocolGuid,E541B7
 SmmSxDispatch,gEfiSmmSxDispatchProtocolGuid,gEfiSmmSxDispatchProtocolGuid,14FC52BE-01DC-426C-91AE-A23C3E220AE8,MdePkg
 SmmUsbDispatch,gEfiSmmUsbDispatchProtocolGuid,gEfiSmmUsbDispatchProtocolGuid,A05B6FFD-87AF-4E42-95C9-6228B63CF3F3,MdePkg
 DeviceIo,gEfiDeviceIoProtocolGuid,gEfiDeviceIoProtocolGuid,AF6AC311-84C3-11D2-8E3C-00A0C969723B,MdePkg
-Capsule,gEfiCapsuleArchProtocolGuid,gEfiCapsuleArchProtocolGuid,5053697E-2EBC-4819-90D9-0580DEEE5754,EdkModulePkg
-CustomizedDecompress,gEfiCustomizedDecompressProtocolGuid,gEfiCustomizedDecompressProtocolGuid,9A44198E-A4A2-44E6-8A1F-39BEFDAC896F,EdkModulePkg
-DebugLevel,gEfiDebugLevelProtocolGuid,gEfiDebugLevelProtocolGuid,8D4C62E6-CD98-4E1D-AD6E-48BB50D29FF7,EdkModulePkg
-TianoDecompress,gEfiTianoDecompressProtocolGuid,gEfiTianoDecompressProtocolGuid,E84CF29C-191F-4EAE-96E1-F46AECEAEA0B,EdkModulePkg
-LoadPeImage,gEfiLoadPeImageProtocolGuid,gEfiLoadPeImageProtocolGuid,5CB5C776-60D5-45EE-883C-452708CD743F,EdkModulePkg
+Capsule,gEfiCapsuleArchProtocolGuid,gEfiCapsuleArchProtocolGuid,5053697E-2EBC-4819-90D9-0580DEEE5754,MdePkg
+CustomizedDecompress,gEfiCustomizedDecompressProtocolGuid,gEfiCustomizedDecompressProtocolGuid,9A44198E-A4A2-44E6-8A1F-39BEFDAC896F,MdeModulePkg
+TianoDecompress,gEfiTianoDecompressProtocolGuid,gEfiTianoDecompressProtocolGuid,E84CF29C-191F-4EAE-96E1-F46AECEAEA0B,MdeModulePkg
+LoadPeImage,gEfiLoadPeImageProtocolGuid,gEfiLoadPeImageProtocolGuid,5CB5C776-60D5-45EE-883C-452708CD743F,MdeModulePkg
 Print,gEfiPrintProtocolGuid,gEfiPrintProtocolGuid,DF2D868E-32FC-4CF0-8E6B-FFD95D1343D0,EdkModulePkg
 GenericMemTest,gEfiGenericMemTestProtocolGuid,gEfiGenericMemTestProtocolGuid,309DE7F1-7F5E-4ACE-B49C-531BE5AA95EF,EdkModulePkg
 DiskInfo,gEfiDiskInfoProtocolGuid,gEfiDiskInfoProtocolGuid,D432A67F-14DC-484B-B3BB-3F0291849327,EdkModulePkg
@@ -137,7 +137,7 @@ FaultTolerantWriteLite,gEfiFaultTolerantWriteLiteProtocolGuid,gEfiFaultTolerantW
 ConsoleControl,gEfiConsoleControlProtocolGuid,gEfiConsoleControlProtocolGuid,F42F7782-012E-4C12-9956-49F94304F721,EdkModulePkg
 OEMBadging,gEfiOEMBadgingProtocolGuid,gEfiOEMBadgingProtocolGuid,170E13C0-BF1B-4218-871D-2ABDC6F887BC,EdkModulePkg
 UgaSplash,gEfiUgaSplashProtocolGuid,gEfiUgaSplashProtocolGuid,A45B3A0D-2E55-4C03-AD9C-27D4820B507E,EdkModulePkg
-AcpiS3Save,gEfiAcpiS3SaveGuid,gEfiAcpiS3SaveProtocolGuid,125F2DE1-FB85-440C-A54C-4D99358A8D38,EdkModulePkg
+AcpiS3Save,gEfiAcpiS3SaveGuid,gEfiAcpiS3SaveProtocolGuid,125F2DE1-FB85-440C-A54C-4D99358A8D38,IntelFrameworkPkg
 PxeDhcp4,gEfiPxeDhcp4ProtocolGuid,gEfiPxeDhcp4ProtocolGuid,03C4E624-AC28-11D3-9A2D-0090293FC14D,EdkModulePkg
 PxeDhcp4Callback,gEfiPxeDhcp4CallbackProtocolGuid,gEfiPxeDhcp4CallbackProtocolGuid,C1544C01-92A4-4198-8A84-778583C23621,EdkModulePkg
 UgaIo,gEfiUgaIoProtocolGuid,gEfiUgaIoProtocolGuid,61A4D49E-6F68-4F1B-B922-A86EED0B07A2,EdkModulePkg