diff --git a/MdePkg/Library/UefiPciLibPciRootBridgeIo/DxePciLibPciRootBridgeIo.inf b/MdePkg/Library/UefiPciLibPciRootBridgeIo/UefiPciLibPciRootBridgeIo.inf
similarity index 91%
rename from MdePkg/Library/UefiPciLibPciRootBridgeIo/DxePciLibPciRootBridgeIo.inf
rename to MdePkg/Library/UefiPciLibPciRootBridgeIo/UefiPciLibPciRootBridgeIo.inf
index 9c6f35d9dd..1aadc52501 100644
--- a/MdePkg/Library/UefiPciLibPciRootBridgeIo/DxePciLibPciRootBridgeIo.inf
+++ b/MdePkg/Library/UefiPciLibPciRootBridgeIo/UefiPciLibPciRootBridgeIo.inf
@@ -21,9 +21,9 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = DxePciLibPciRootBridgeIo
+  BASE_NAME                      = UefiPciLibPciRootBridgeIo
   FILE_GUID                      = 90EC42CB-B780-4eb8-8E99-C8E3E5F37530
-  MODULE_TYPE                    = DXE_DRIVER
+  MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = PciLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION
   EDK_RELEASE_VERSION            = 0x00020000
diff --git a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/DxePciSegmentLibPciRootBridgeIo.inf b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/UefiPciSegmentLibPciRootBridgeIo.inf
similarity index 91%
rename from MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/DxePciSegmentLibPciRootBridgeIo.inf
rename to MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/UefiPciSegmentLibPciRootBridgeIo.inf
index abb442f8f6..ef544cd801 100644
--- a/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/DxePciSegmentLibPciRootBridgeIo.inf
+++ b/MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/UefiPciSegmentLibPciRootBridgeIo.inf
@@ -21,9 +21,9 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = DxePciSegmentLibPciRootBridgeIo
+  BASE_NAME                      = UefiPciSegmentLibPciRootBridgeIo
   FILE_GUID                      = C6068612-B6E0-48a3-BB92-60E4A4F89EDF
-  MODULE_TYPE                    = DXE_DRIVER
+  MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = PciSegmentLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION
   EDK_RELEASE_VERSION            = 0x00020000
diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index 7230251964..887be9f805 100644
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -78,8 +78,6 @@
   MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
   MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
   MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf
-  MdePkg/Library/DxePciLibPciRootBridgeIo/DxePciLibPciRootBridgeIo.inf
-  MdePkg/Library/DxePciSegmentLibPciRootBridgeIo/DxePciSegmentLibPciRootBridgeIo.inf
 
   MdePkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
   MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf
@@ -110,6 +108,8 @@
   MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
   MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
   MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
+  MdePkg/Library/UefiPciLibPciRootBridgeIo/UefiPciLibPciRootBridgeIo.inf
+  MdePkg/Library/UefiPciSegmentLibPciRootBridgeIo/UefiPciSegmentLibPciRootBridgeIo.inf
 
 [Components.IA32, Components.X64]
   MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf