16 files changed, 6 insertions, 6 deletions
diff --git a/PcAtChipsetPkg/8254TimerDxe/Timer.uni b/PcAtChipsetPkg/8254TimerDxe/Timer.uni
index abcecbf747..aea2e7328e 100644
--- a/PcAtChipsetPkg/8254TimerDxe/Timer.uni
+++ b/PcAtChipsetPkg/8254TimerDxe/Timer.uni
diff --git a/PcAtChipsetPkg/8259InterruptControllerDxe/Legacy8259.uni b/PcAtChipsetPkg/8259InterruptControllerDxe/Legacy8259.uni
index 1eae4f664c..812f5e4b9f 100644
--- a/PcAtChipsetPkg/8259InterruptControllerDxe/Legacy8259.uni
+++ b/PcAtChipsetPkg/8259InterruptControllerDxe/Legacy8259.uni
diff --git a/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.uni b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.uni
index 89bdb2b931..185c538f73 100644
--- a/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.uni
+++ b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.uni
diff --git a/PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.uni b/PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.uni
index 766d1a689d..1d0d88c080 100644
--- a/PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.uni
+++ b/PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.uni
diff --git a/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.uni b/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.uni
index cdccad7032..5aaf43692b 100644
--- a/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.uni
+++ b/PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.uni
diff --git a/PcAtChipsetPkg/KbcResetDxe/KbcReset.uni b/PcAtChipsetPkg/KbcResetDxe/KbcReset.uni
index a0dd20b286..7c1591f3d7 100644
--- a/PcAtChipsetPkg/KbcResetDxe/KbcReset.uni
+++ b/PcAtChipsetPkg/KbcResetDxe/KbcReset.uni
diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf b/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
index 0a9df954e9..fcd7814a57 100644
--- a/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
+++ b/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
@@ -1,5 +1,5 @@
 ## @file
-#  ACPI Timer Library
+#  Base ACPI Timer Library
 #
 #  Provides basic timer support using the ACPI timer hardware.  The performance
 #  counter features are provided by the processors time stamp counter. 
@@ -17,13 +17,13 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = AcpiTimerLib
+  BASE_NAME                      = BaseAcpiTimerLib
   FILE_GUID                      = 564DE85F-049E-4481-BF7A-CA04D2788CF9
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = TimerLib|SEC PEI_CORE PEIM
   CONSTRUCTOR                    = AcpiTimerLibConstructor
-  MODULE_UNI_FILE                = AcpiTimerLibModStrs.uni
+  MODULE_UNI_FILE                = BaseAcpiTimerLib.uni
 
 [Sources]
   AcpiTimerLib.c
diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLibModStrs.uni b/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.uni
index 27d3d880af..a3d8f3c1ec 100644
--- a/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLibModStrs.uni
+++ b/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.uni
diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
index 935edf61d9..5c8a8e6852 100644
--- a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
+++ b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
@@ -1,5 +1,5 @@
 ## @file
-#  ACPI Timer Library
+#  DXE ACPI Timer Library
 #
 #  Provides basic timer support using the ACPI timer hardware.  The performance
 #  counter features are provided by the processors time stamp counter. 
@@ -17,13 +17,13 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = AcpiTimerLib
+  BASE_NAME                      = DxeAcpiTimerLib
   FILE_GUID                      = E624B98C-845A-4b94-9B50-B20475D552B9
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = TimerLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER SMM_CORE
   CONSTRUCTOR                    = AcpiTimerLibConstructor
-  MODULE_UNI_FILE                = AcpiTimerLibModStrs.uni
+  MODULE_UNI_FILE                = DxeAcpiTimerLib.uni
 
 [Sources]
   AcpiTimerLib.c
diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLib.uni b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.uni
index 15b81a4f11..d56eb31845 100644
--- a/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLib.uni
+++ b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.uni
diff --git a/PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.uni b/PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.uni
index ee7eabf27e..15f284038a 100644
--- a/PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.uni
+++ b/PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.uni
diff --git a/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.uni b/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.uni
index 84b4788aa8..79868be6de 100644
--- a/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.uni
+++ b/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.uni
diff --git a/PcAtChipsetPkg/Library/SerialIoLib/PcAtSerialPortLib.uni b/PcAtChipsetPkg/Library/SerialIoLib/PcAtSerialPortLib.uni
index c93e64f167..decd83fe44 100644
--- a/PcAtChipsetPkg/Library/SerialIoLib/PcAtSerialPortLib.uni
+++ b/PcAtChipsetPkg/Library/SerialIoLib/PcAtSerialPortLib.uni
diff --git a/PcAtChipsetPkg/PcAtChipsetPkg.uni b/PcAtChipsetPkg/PcAtChipsetPkg.uni
index 959616a082..13bb48f6fd 100644
--- a/PcAtChipsetPkg/PcAtChipsetPkg.uni
+++ b/PcAtChipsetPkg/PcAtChipsetPkg.uni
diff --git a/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.uni b/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.uni
index 27f278a3c6..8c61c4e146 100644
--- a/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.uni
+++ b/PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcRtc.uni
diff --git a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.uni b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.uni
index acc30c6d13..b87718fd78 100644
--- a/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.uni
+++ b/PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridge.uni