7 files changed, 9 insertions, 9 deletions
diff --git a/ArmPkg/Drivers/PL390Gic/PL390Gic.c b/ArmPkg/Drivers/ArmGic/ArmGic.c
index 8a10d113f7..8a10d113f7 100644
--- a/ArmPkg/Drivers/PL390Gic/PL390Gic.c
+++ b/ArmPkg/Drivers/ArmGic/ArmGic.c
diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c b/ArmPkg/Drivers/ArmGic/ArmGicDxe.c
index 111ce14438..111ce14438 100644
--- a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c
+++ b/ArmPkg/Drivers/ArmGic/ArmGicDxe.c
diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf b/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
index cf0b8f3fe6..9dc557a037 100644
--- a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
@@ -15,7 +15,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = PL390GicDxe
+  BASE_NAME                      = ArmGicDxe
   FILE_GUID                      = DE371F7C-DEC4-4D21-ADF1-593ABCC15882 
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -24,8 +24,8 @@
 
 
 [Sources.common]
-  PL390Gic.c
-  PL390GicDxe.c
+  ArmGic.c
+  ArmGicDxe.c
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicLib.inf b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
index d0cac02034..dab29b99c2 100644
--- a/ArmPkg/Drivers/PL390Gic/PL390GicLib.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
@@ -13,15 +13,15 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = PL390GicLib
+  BASE_NAME                      = ArmGicLib
   FILE_GUID                      = 03d05ee4-cdeb-458c-9dfc-993f09bdf405
   MODULE_TYPE                    = SEC
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = ArmGicLib
 
 [Sources]
-  PL390Gic.c
-  PL390GicNonSec.c
+  ArmGic.c
+  ArmGicNonSec.c
 
 [LibraryClasses]
   IoLib
diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicNonSec.c b/ArmPkg/Drivers/ArmGic/ArmGicNonSec.c
index 55ff56e797..55ff56e797 100644
--- a/ArmPkg/Drivers/PL390Gic/PL390GicNonSec.c
+++ b/ArmPkg/Drivers/ArmGic/ArmGicNonSec.c
diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicSec.c b/ArmPkg/Drivers/ArmGic/ArmGicSec.c
index bae76e441b..bae76e441b 100644
--- a/ArmPkg/Drivers/PL390Gic/PL390GicSec.c
+++ b/ArmPkg/Drivers/ArmGic/ArmGicSec.c
diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf b/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf
index 205e503427..bb7f242517 100644
--- a/ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf
@@ -13,15 +13,15 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = PL390GicSecLib
+  BASE_NAME                      = ArmGicSecLib
   FILE_GUID                      = 85f3cf80-b5f4-11df-9855-0002a5d5c51b
   MODULE_TYPE                    = SEC
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = ArmGicLib
 
 [Sources]
-  PL390Gic.c
-  PL390GicSec.c
+  ArmGic.c
+  ArmGicSec.c
 
 [Packages]
   ArmPkg/ArmPkg.dec