diff --git a/MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.inf b/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
similarity index 100%
rename from MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.inf
rename to MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
diff --git a/MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.msa b/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.msa
similarity index 100%
rename from MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.msa
rename to MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.msa
diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index 6a0a2f9e29..6e33f8a822 100644
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -67,6 +67,7 @@
   MdePkg/Library/BasePrintLib/BasePrintLib.inf
   MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
   MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
+  MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
   MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf
   MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf
   MdePkg/Library/DxeHobLib/DxeHobLib.inf
@@ -101,7 +102,6 @@
   MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
   MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
   MdePkg/Library/DxeMemoryLib/DxeMemoryLib.inf
-  MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.inf
   MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
   MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf