diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index 85f431f14a..5297935065 100644
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -87,7 +87,7 @@
   ArmTransferListLib|ArmPkg/Library/ArmTransferListLib/ArmTransferListLib.inf
   ArmFfaLib|MdeModulePkg/Library/ArmFfaLib/ArmFfaDxeLib.inf
 
-  ArmMtlLib|ArmPkg/Library/ArmMtlNullLib/ArmMtlNullLib.inf
+  ArmMtlLib|ArmPkg/Library/ArmMtlLibNull/ArmMtlLibNull.inf
 
   OemMiscLib|ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf
 
@@ -141,7 +141,7 @@
   ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
   ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
   ArmPkg/Library/ArmLib/ArmBaseLib.inf
-  ArmPkg/Library/ArmMtlNullLib/ArmMtlNullLib.inf
+  ArmPkg/Library/ArmMtlLibNull/ArmMtlLibNull.inf
   ArmPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
   ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
   ArmPkg/Library/LinuxBootBootManagerLib/LinuxBootBootManagerLib.inf
diff --git a/ArmPkg/Library/ArmMtlNullLib/ArmMtlNullLib.c b/ArmPkg/Library/ArmMtlLibNull/ArmMtlLibNull.c
similarity index 100%
rename from ArmPkg/Library/ArmMtlNullLib/ArmMtlNullLib.c
rename to ArmPkg/Library/ArmMtlLibNull/ArmMtlLibNull.c
diff --git a/ArmPkg/Library/ArmMtlNullLib/ArmMtlNullLib.inf b/ArmPkg/Library/ArmMtlLibNull/ArmMtlLibNull.inf
similarity index 83%
rename from ArmPkg/Library/ArmMtlNullLib/ArmMtlNullLib.inf
rename to ArmPkg/Library/ArmMtlLibNull/ArmMtlLibNull.inf
index 605c272081..ddd117f9c1 100644
--- a/ArmPkg/Library/ArmMtlNullLib/ArmMtlNullLib.inf
+++ b/ArmPkg/Library/ArmMtlLibNull/ArmMtlLibNull.inf
@@ -6,14 +6,14 @@
 
 [Defines]
   INF_VERSION                    = 0x00010019
-  BASE_NAME                      = ArmMtlNullLib
+  BASE_NAME                      = ArmMtlLibNull
   FILE_GUID                      = 05810525-FDEC-4006-9F1F-37609B3675FA
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = ArmMtlLib
 
 [Sources.common]
-  ArmMtlNullLib.c
+  ArmMtlLibNull.c
 
 [Packages]
   ArmPkg/ArmPkg.dec