diff --git a/MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c b/MdePkg/Library/BaseDebugLibSerialPort/DebugLib.c
similarity index 96%
rename from MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c
rename to MdePkg/Library/BaseDebugLibSerialPort/DebugLib.c
index b98761a9e5..2c92365ec8 100644
--- a/MdePkg/Library/DxeDebugLibSerialPort/DebugLib.c
+++ b/MdePkg/Library/BaseDebugLibSerialPort/DebugLib.c
@@ -13,7 +13,7 @@
 
 **/
 
-#include <PiDxe.h>
+#include <Base.h>
 #include <Library/DebugLib.h>
 #include <Library/BaseLib.h>
 #include <Library/PrintLib.h>
diff --git a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf b/MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.inf
similarity index 92%
rename from MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf
rename to MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.inf
index 9eb047fd94..42a19f5db2 100644
--- a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf
+++ b/MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.inf
@@ -16,7 +16,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = DxeDebugLibSerialPort
+  BASE_NAME                      = BaseDebugLibSerialPort
   FILE_GUID                      = BB83F95F-EDBC-4884-A520-CD42AF388FAE
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
diff --git a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.msa b/MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.msa
similarity index 95%
rename from MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.msa
rename to MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.msa
index 8c9dd5b5ec..618744732e 100644
--- a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.msa
+++ b/MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.msa
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <ModuleName>DxeDebugLibSerialPort</ModuleName>
-    <ModuleType>DXE_DRIVER</ModuleType>
+    <ModuleName>BaseDebugLibSerialPort</ModuleName>
+    <ModuleType>BASE</ModuleType>
     <GuidValue>BB83F95F-EDBC-4884-A520-CD42AF388FAE</GuidValue>
     <Version>1.0</Version>
     <Abstract>Debug Library for UEFI drivers</Abstract>
diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index c43cd5cd25..6a0a2f9e29 100644
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -101,7 +101,7 @@
   MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
   MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
   MdePkg/Library/DxeMemoryLib/DxeMemoryLib.inf
-  MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf
+  MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.inf
   MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
   MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf