diff --git a/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridge.h b/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridge.h
index 582b7929af..cb05220161 100644
--- a/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridge.h
+++ b/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridge.h
@@ -1,5 +1,6 @@
 /** @file
-  Header file of OVMF instance of PciHostBridgeLib.
+  OVMF's instance of the PCI Host Bridge Library, for Bhyve and Xen guests;
+  internal declarations.
 
   Copyright (C) 2021, Red Hat, Inc.
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
diff --git a/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridgeLib.c b/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridgeLib.c
index f0166e0f72..ac8d1033df 100644
--- a/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridgeLib.c
+++ b/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridgeLib.c
@@ -1,5 +1,5 @@
 /** @file
-  OVMF's instance of the PCI Host Bridge Library.
+  OVMF's instance of the PCI Host Bridge Library, for Bhyve and Xen guests.
 
   Copyright (C) 2016-2021, Red Hat, Inc.
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
diff --git a/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridgeLibScan.inf b/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridgeLibScan.inf
index 199db4cbbd..a2ac5f93d1 100644
--- a/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridgeLibScan.inf
+++ b/OvmfPkg/Library/PciHostBridgeLibScan/PciHostBridgeLibScan.inf
@@ -1,5 +1,5 @@
 ## @file
-#  OVMF's instance of the PCI Host Bridge Library.
+#  OVMF's instance of the PCI Host Bridge Library, for Bhyve and Xen guests.
 #
 #  Copyright (C) 2016-2021, Red Hat, Inc.
 #  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>
@@ -27,7 +27,7 @@
 [Sources]
   PciHostBridge.h
   PciHostBridgeLib.c
-  XenSupport.c
+  ScanForRootBridges.c
 
 [Packages]
   MdeModulePkg/MdeModulePkg.dec
diff --git a/OvmfPkg/Library/PciHostBridgeLibScan/XenSupport.c b/OvmfPkg/Library/PciHostBridgeLibScan/ScanForRootBridges.c
similarity index 96%
rename from OvmfPkg/Library/PciHostBridgeLibScan/XenSupport.c
rename to OvmfPkg/Library/PciHostBridgeLibScan/ScanForRootBridges.c
index edf993e82d..a6126a1aea 100644
--- a/OvmfPkg/Library/PciHostBridgeLibScan/XenSupport.c
+++ b/OvmfPkg/Library/PciHostBridgeLibScan/ScanForRootBridges.c
@@ -1,5 +1,5 @@
 /** @file
-  Scan the entire PCI bus for root bridges to support OVMF above Xen.
+  Scan the entire PCI bus for root bridges to support OVMF on Bhyve and Xen.
 
   Copyright (C) 2021, Red Hat, Inc.
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>