diff --git a/MdePkg/Include/Library/DxeRuntimeDriverLib.h b/MdePkg/Include/Library/UefiRuntimeLib.h
similarity index 96%
rename from MdePkg/Include/Library/DxeRuntimeDriverLib.h
rename to MdePkg/Include/Library/UefiRuntimeLib.h
index e997a6d847..f98f52eebc 100644
--- a/MdePkg/Include/Library/DxeRuntimeDriverLib.h
+++ b/MdePkg/Include/Library/UefiRuntimeLib.h
@@ -10,12 +10,12 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-  Module Name:  DxeRuntimeDriverLib.h
+  Module Name:  UefiRuntimeLib.h
 
 **/
 
-#ifndef __DXE_RUNTIME_DRIVER_LIB__
-#define __DXE_RUNTIME_DRIVER_LIB__
+#ifndef __UEFI_RUNTIME_LIB__
+#define __UEFI_RUNTIME_LIB__
 
 
 extern const EFI_EVENT_NOTIFY _gDriverExitBootServicesEvent[];
diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 16093cb794..5be668583d 100644
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -60,8 +60,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <IncludeHeader>Include/Library/DxeCoreEntryPoint.h</IncludeHeader>
       <HelpText/>
     </LibraryClass>
-    <LibraryClass Name="DxeRuntimeDriverLib">
-      <IncludeHeader>Include/Library/DxeRuntimeDriverLib.h</IncludeHeader>
+    <LibraryClass Name="UefiRuntimeLib">
+      <IncludeHeader>Include/Library/UefiRuntimeLib.h</IncludeHeader>
       <HelpText/>
     </LibraryClass>
     <LibraryClass Name="DxeServicesTableLib">
@@ -478,8 +478,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <IncludeHeader>Include/Library/DxeCoreEntryPoint.h</IncludeHeader>
       <HelpText/>
     </IndustryStdHeader>
-    <IndustryStdHeader Name="DxeRuntimeDriverLib">
-      <IncludeHeader>Include/Library/DxeRuntimeDriverLib.h</IncludeHeader>
+    <IndustryStdHeader Name="UefiRuntimeLib">
+      <IncludeHeader>Include/Library/UefiRuntimeLib.h</IncludeHeader>
       <HelpText/>
     </IndustryStdHeader>
     <IndustryStdHeader Name="DxeServicesTableLib">