diff --git a/MdeModulePkg/Include/Library/BaseMemoryTestLib.h b/MdeModulePkg/Include/Library/MemoryTestLib.h
similarity index 100%
rename from MdeModulePkg/Include/Library/BaseMemoryTestLib.h
rename to MdeModulePkg/Include/Library/MemoryTestLib.h
diff --git a/MdeModulePkg/Library/BaseMemoryTestLib/BaseMemoryTestLib.c b/MdeModulePkg/Library/BaseMemoryTestLib/BaseMemoryTestLib.c
index c939450bbd..878b7558b6 100644
--- a/MdeModulePkg/Library/BaseMemoryTestLib/BaseMemoryTestLib.c
+++ b/MdeModulePkg/Library/BaseMemoryTestLib/BaseMemoryTestLib.c
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
 #include <Base.h>
-#include <Library/BaseMemoryTestLib.h>
+#include <Library/MemoryTestLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/CacheMaintenanceLib.h>
 #include <Library/DebugLib.h>
diff --git a/MdeModulePkg/Library/BaseMemoryTestLib/BaseMemoryTestLib.inf b/MdeModulePkg/Library/BaseMemoryTestLib/BaseMemoryTestLib.inf
index f1bd88823f..ff6273e394 100644
--- a/MdeModulePkg/Library/BaseMemoryTestLib/BaseMemoryTestLib.inf
+++ b/MdeModulePkg/Library/BaseMemoryTestLib/BaseMemoryTestLib.inf
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   FILE_GUID                      = 216CAA56-AF75-4BBB-9D74-CC0960E92ECB
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = BaseMemoryTestLib
+  LIBRARY_CLASS                  = MemoryTestLib
 
 #
 # The following information is for reference only and not required by the build tools.
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   MdeModulePkg/MdeModulePkg.dec
 
 [LibraryClasses]
-  BaseMemoryTestLib
+  MemoryTestLib
   BaseMemoryLib
   CacheMaintenanceLib
   DebugLib
diff --git a/MdeModulePkg/Library/BaseMemoryTestLibNull/BaseMemoryTestLibNull.c b/MdeModulePkg/Library/BaseMemoryTestLibNull/BaseMemoryTestLibNull.c
index e88a22536a..747fc16f11 100644
--- a/MdeModulePkg/Library/BaseMemoryTestLibNull/BaseMemoryTestLibNull.c
+++ b/MdeModulePkg/Library/BaseMemoryTestLibNull/BaseMemoryTestLibNull.c
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/
 
 #include <Base.h>
-#include <Library/BaseMemoryTestLib.h>
+#include <Library/MemoryTestLib.h>
 
 /**
   Perform a quick system memory range test.
diff --git a/MdeModulePkg/Library/BaseMemoryTestLibNull/BaseMemoryTestLibNull.inf b/MdeModulePkg/Library/BaseMemoryTestLibNull/BaseMemoryTestLibNull.inf
index 79f1395f26..3587516daf 100644
--- a/MdeModulePkg/Library/BaseMemoryTestLibNull/BaseMemoryTestLibNull.inf
+++ b/MdeModulePkg/Library/BaseMemoryTestLibNull/BaseMemoryTestLibNull.inf
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   FILE_GUID                      = D519E511-9C1C-47F5-AE01-FD216E779269
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = BaseMemoryTestLib
+  LIBRARY_CLASS                  = MemoryTestLib
 
 #
 # The following information is for reference only and not required by the build tools.
@@ -34,4 +34,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   MdeModulePkg/MdeModulePkg.dec
 
 [LibraryClasses]
-  BaseMemoryTestLib
+  MemoryTestLib
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index ebd59e17c3..9a07e3fd72 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -78,7 +78,7 @@
 
   ##  @libraryclass  Provides APIs for system memory test.
   ##
-  BaseMemoryTestLib|Include/Library/BaseMemoryTestLib.h
+  MemoryTestLib|Include/Library/MemoryTestLib.h
 
 [Guids.common]
   ## MdeModule package token space guid
diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 59c33d6c64..9fab0b92b8 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -77,7 +77,7 @@
   PlatformDriverOverrideLib|MdeModulePkg/Library/DxePlatDriOverLib/DxePlatDriOverLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
-  BaseMemoryTestLib|MdeModulePkg/Library/BaseMemoryTestLibNull/BaseMemoryTestLibNull.inf
+  MemoryTestLib|MdeModulePkg/Library/BaseMemoryTestLibNull/BaseMemoryTestLibNull.inf
 
 [LibraryClasses.IA32]
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf