6 files changed, 13 insertions, 13 deletions
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 1ba63d2e16..16bec9785e 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -92,7 +92,7 @@
   TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf
 !endif
 
-  ArmMonitorLib|ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.inf
+  ArmMonitorLib|ArmVirtPkg/Library/ArmVirtMonitorLib/ArmVirtMonitorLib.inf
 
 [LibraryClasses.AARCH64]
   ArmPlatformLib|ArmVirtPkg/Library/ArmPlatformLibQemu/ArmPlatformLibQemu.inf
@@ -102,7 +102,7 @@
 
 [LibraryClasses.common.PEIM]
   ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
-  ArmMonitorLib|ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.inf
+  ArmMonitorLib|ArmVirtPkg/Library/ArmVirtMonitorPeiLib/ArmVirtMonitorPeiLib.inf
   FdtLib|MdePkg/Library/BaseFdtLib/BaseFdtLib.inf
   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
 
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 9927bdae0e..84b4f71f29 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -82,7 +82,7 @@
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
   TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf
 
-  ArmMonitorLib|ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.inf
+  ArmMonitorLib|ArmVirtPkg/Library/ArmVirtMonitorLib/ArmVirtMonitorLib.inf
 
 [LibraryClasses.common.DXE_DRIVER]
   AcpiPlatformLib|OvmfPkg/Library/AcpiPlatformLib/DxeAcpiPlatformLib.inf
diff --git a/ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.c b/ArmVirtPkg/Library/ArmVirtMonitorLib/ArmVirtMonitorLib.c
index 1c8b18d5e5..15171ef51b 100644
--- a/ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.c
+++ b/ArmVirtPkg/Library/ArmVirtMonitorLib/ArmVirtMonitorLib.c
@@ -1,6 +1,6 @@
 /** @file
   Arm Monitor Library that chooses the conduit based on the PSCI node in the
-  device tree provided by QEMU
+  device tree provided by the VMM.
 
   Copyright (c) 2022, Arm Limited. All rights reserved.<BR>
   Copyright (c) 2024, Google LLC. All rights reserved.<BR>
@@ -29,7 +29,7 @@ STATIC UINT32  mArmSmcccMethod;
 **/
 RETURN_STATUS
 EFIAPI
-ArmVirtQemuMonitorLibConstructor (
+ArmVirtMonitorLibConstructor (
   VOID
   )
 {
diff --git a/ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.inf b/ArmVirtPkg/Library/ArmVirtMonitorLib/ArmVirtMonitorLib.inf
index e43ba215c2..fe6098aea3 100644
--- a/ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.inf
+++ b/ArmVirtPkg/Library/ArmVirtMonitorLib/ArmVirtMonitorLib.inf
@@ -1,6 +1,6 @@
 ## @file
 #  Arm Monitor Library that chooses the conduit based on the PSCI node in the
-#  device tree provided by QEMU
+#  device tree provided by the VMM
 #
 #  Copyright (c) 2022, Arm Limited. All rights reserved.<BR>
 #  Copyright (c) 2024, Google LLC. All rights reserved.<BR>
@@ -10,15 +10,15 @@
 
 [Defines]
   INF_VERSION                    = 1.29
-  BASE_NAME                      = ArmVirtQemuMonitorLib
+  BASE_NAME                      = ArmVirtMonitorLib
   FILE_GUID                      = 09f50ee5-2aa2-42b9-a2a0-090faeefed2b
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = ArmMonitorLib|DXE_DRIVER DXE_RUNTIME_DRIVER
-  CONSTRUCTOR                    = ArmVirtQemuMonitorLibConstructor
+  CONSTRUCTOR                    = ArmVirtMonitorLibConstructor
 
 [Sources]
-  ArmVirtQemuMonitorLib.c
+  ArmVirtMonitorLib.c
 
 [Packages]
   ArmPkg/ArmPkg.dec
diff --git a/ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.c b/ArmVirtPkg/Library/ArmVirtMonitorPeiLib/ArmVirtMonitorPeiLib.c
index aa8d5d6082..7b0ba6262b 100644
--- a/ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.c
+++ b/ArmVirtPkg/Library/ArmVirtMonitorPeiLib/ArmVirtMonitorPeiLib.c
@@ -1,6 +1,6 @@
 /** @file
   Arm Monitor Library that chooses the conduit based on the PSCI node in the
-  device tree provided by QEMU.
+  device tree provided by the VMM.
 
   Copyright (c) 2022, Arm Limited. All rights reserved.<BR>
   Copyright (c) 2024, Google LLC. All rights reserved.<BR>
diff --git a/ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.inf b/ArmVirtPkg/Library/ArmVirtMonitorPeiLib/ArmVirtMonitorPeiLib.inf
index cd850f342d..a337428be4 100644
--- a/ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.inf
+++ b/ArmVirtPkg/Library/ArmVirtMonitorPeiLib/ArmVirtMonitorPeiLib.inf
@@ -1,6 +1,6 @@
 ## @file
 #  Arm Monitor Library that chooses the conduit based on the PSCI node in the
-#  device tree provided by QEMU.
+#  device tree provided by the VMM.
 #
 #  Copyright (c) 2022, Arm Limited. All rights reserved.<BR>
 #  Copyright (c) 2024, Google LLC. All rights reserved.<BR>
@@ -10,14 +10,14 @@
 
 [Defines]
   INF_VERSION                    = 1.29
-  BASE_NAME                      = ArmVirtQemuMonitorPeiLib
+  BASE_NAME                      = ArmVirtMonitorPeiLib
   FILE_GUID                      = c610e0dc-dd7a-47c8-8fea-26c4710709ff
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = ArmMonitorLib|PEIM
 
 [Sources]
-  ArmVirtQemuMonitorPeiLib.c
+  ArmVirtMonitorPeiLib.c
 
 [Packages]
   ArmPkg/ArmPkg.dec