diff --git a/MdePkg/Library/BaseDebugLibSerialPort/DebugLib.c b/MdePkg/Library/BaseDebugLibSerialPort/DebugLib.c
index 6fa235c2af..8ab084721e 100644
--- a/MdePkg/Library/BaseDebugLibSerialPort/DebugLib.c
+++ b/MdePkg/Library/BaseDebugLibSerialPort/DebugLib.c
@@ -133,7 +133,7 @@ DebugAssert (
   //
   // Generate the ASSERT() message in Ascii format
   //
-  AsciiSPrint (Buffer, sizeof (Buffer), "ASSERT %a(%d): %a\n", FileName, LineNumber, Description);
+  AsciiSPrint (Buffer, sizeof (Buffer), "ASSERT [%a] %a(%d): %a\n", gEfiCallerBaseName, FileName, LineNumber, Description);
 
   //
   // Send the print string to the Console Output device
diff --git a/MdePkg/Library/UefiDebugLibConOut/DebugLib.c b/MdePkg/Library/UefiDebugLibConOut/DebugLib.c
index 2ac2204e1d..0bc112fd1b 100644
--- a/MdePkg/Library/UefiDebugLibConOut/DebugLib.c
+++ b/MdePkg/Library/UefiDebugLibConOut/DebugLib.c
@@ -121,7 +121,8 @@ DebugAssert (
   UnicodeSPrintAsciiFormat (
     Buffer, 
     sizeof (Buffer), 
-    "ASSERT %a(%d): %a\n", 
+    "ASSERT [%a] %a(%d): %a\n",
+    gEfiCallerBaseName,
     FileName, 
     LineNumber, 
     Description
diff --git a/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLib.c b/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLib.c
index 10d3e347cc..44bf6ba128 100644
--- a/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLib.c
+++ b/MdePkg/Library/UefiDebugLibDebugPortProtocol/DebugLib.c
@@ -175,7 +175,8 @@ DebugAssert (
   AsciiSPrint (
     Buffer, 
     sizeof (Buffer), 
-    "ASSERT %a(%d): %a\n", 
+    "ASSERT [%a] %a(%d): %a\n",
+    gEfiCallerBaseName,
     FileName, 
     LineNumber, 
     Description
diff --git a/MdePkg/Library/UefiDebugLibStdErr/DebugLib.c b/MdePkg/Library/UefiDebugLibStdErr/DebugLib.c
index bbd6d94644..cacb90a244 100644
--- a/MdePkg/Library/UefiDebugLibStdErr/DebugLib.c
+++ b/MdePkg/Library/UefiDebugLibStdErr/DebugLib.c
@@ -122,7 +122,8 @@ DebugAssert (
   UnicodeSPrintAsciiFormat (
     Buffer, 
     sizeof (Buffer),
-    "ASSERT %a(%d): %a\n", 
+    "ASSERT [%a] %a(%d): %a\n",
+    gEfiCallerBaseName,
     FileName, 
     LineNumber, 
     Description