diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 29f2d0651dea14b4cfa5be4fcac6d3b559819229..7af0864b8199668c1476fa5fc27929a07306667c 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1306,11 +1306,11 @@ virHostdevPreparePCIDevices;
 virHostdevPrepareSCSIDevices;
 virHostdevPrepareUSBDevices;
 virHostdevReAttachPCIDevices;
-virHostdevReAttachSCSIHostdevs;
-virHostdevReAttachUSBHostdevs;
-virHostdevUpdateActivePCIHostdevs;
-virHostdevUpdateActiveSCSIHostdevs;
-virHostdevUpdateActiveUSBHostdevs;
+virHostdevReAttachSCSIDevices;
+virHostdevReAttachUSBDevices;
+virHostdevUpdateActivePCIDevices;
+virHostdevUpdateActiveSCSIDevices;
+virHostdevUpdateActiveUSBDevices;
 
 # util/viridentity.h
 virIdentityGetAttr;
diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 4fb04081988436bad86418c433b6e9ae3b14e0a1..0b6cb3e49262b9d0c3c72f7d37fb771939a2357e 100644
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -50,7 +50,7 @@ qemuUpdateActivePCIHostdevs(virQEMUDriverPtr driver,
     if (!def->nhostdevs)
         return 0;
 
-    return virHostdevUpdateActivePCIHostdevs(mgr, QEMU_DRIVER_NAME, def);
+    return virHostdevUpdateActivePCIDevices(mgr, QEMU_DRIVER_NAME, def);
 }
 
 int
@@ -62,7 +62,7 @@ qemuUpdateActiveUSBHostdevs(virQEMUDriverPtr driver,
     if (!def->nhostdevs)
         return 0;
 
-    return virHostdevUpdateActiveUSBHostdevs(mgr, QEMU_DRIVER_NAME, def);
+    return virHostdevUpdateActiveUSBDevices(mgr, QEMU_DRIVER_NAME, def);
 }
 
 int
@@ -74,7 +74,7 @@ qemuUpdateActiveSCSIHostdevs(virQEMUDriverPtr driver,
     if (!def->nhostdevs)
         return 0;
 
-    return virHostdevUpdateActiveSCSIHostdevs(mgr, QEMU_DRIVER_NAME, def);
+    return virHostdevUpdateActiveSCSIDevices(mgr, QEMU_DRIVER_NAME, def);
 }
 
 
@@ -324,7 +324,7 @@ qemuDomainReAttachHostUSBDevices(virQEMUDriverPtr driver,
 {
     virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr;
 
-    virHostdevReAttachUSBHostdevs(hostdev_mgr, QEMU_DRIVER_NAME,
+    virHostdevReAttachUSBDevices(hostdev_mgr, QEMU_DRIVER_NAME,
                                   name, hostdevs, nhostdevs);
 }
 
@@ -347,8 +347,8 @@ qemuDomainReAttachHostSCSIDevices(virQEMUDriverPtr driver,
         ignore_value(qemuRemoveSharedDevice(driver, &dev, name));
     }
 
-    virHostdevReAttachSCSIHostdevs(hostdev_mgr, QEMU_DRIVER_NAME,
-                                   name, hostdevs, nhostdevs);
+    virHostdevReAttachSCSIDevices(hostdev_mgr, QEMU_DRIVER_NAME,
+                                  name, hostdevs, nhostdevs);
 }
 
 void
diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index 513d2f966201979f95ad18e9433c5382aaf7054c..a51e882052316a35dba344514408d68aff20fc99 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -775,9 +775,9 @@ cleanup:
 }
 
 int
-virHostdevUpdateActivePCIHostdevs(virHostdevManagerPtr mgr,
-                                  const char *drv_name,
-                                  virDomainDefPtr def)
+virHostdevUpdateActivePCIDevices(virHostdevManagerPtr mgr,
+                                 const char *drv_name,
+                                 virDomainDefPtr def)
 {
     virDomainHostdevDefPtr hostdev = NULL;
     virPCIDevicePtr dev = NULL;
@@ -834,9 +834,9 @@ cleanup:
 }
 
 int
-virHostdevUpdateActiveUSBHostdevs(virHostdevManagerPtr mgr,
-                                  const char *drv_name,
-                                  virDomainDefPtr def)
+virHostdevUpdateActiveUSBDevices(virHostdevManagerPtr mgr,
+                                 const char *drv_name,
+                                 virDomainDefPtr def)
 {
     virDomainHostdevDefPtr hostdev = NULL;
     size_t i;
@@ -877,9 +877,9 @@ cleanup:
 }
 
 int
-virHostdevUpdateActiveSCSIHostdevs(virHostdevManagerPtr mgr,
-                                   const char *drv_name,
-                                   virDomainDefPtr def)
+virHostdevUpdateActiveSCSIDevices(virHostdevManagerPtr mgr,
+                                  const char *drv_name,
+                                  virDomainDefPtr def)
 {
     virDomainHostdevDefPtr hostdev = NULL;
     size_t i;
@@ -926,10 +926,10 @@ cleanup:
 }
 
 static int
-virHostdevMarkUSBHostdevs(virHostdevManagerPtr mgr,
-                          const char *drv_name,
-                          const char *dom_name,
-                          virUSBDeviceListPtr list)
+virHostdevMarkUSBDevices(virHostdevManagerPtr mgr,
+                         const char *drv_name,
+                         const char *dom_name,
+                         virUSBDeviceListPtr list)
 {
     size_t i, j;
     unsigned int count;
@@ -1123,7 +1123,7 @@ virHostdevPrepareUSBDevices(virHostdevManagerPtr hostdev_mgr,
      * and add them do driver list. However, if something goes
      * wrong, perform rollback.
      */
-    if (virHostdevMarkUSBHostdevs(hostdev_mgr, drv_name, dom_name, list) < 0)
+    if (virHostdevMarkUSBDevices(hostdev_mgr, drv_name, dom_name, list) < 0)
         goto cleanup;
 
     /* Loop 2: Temporary list was successfully merged with
@@ -1254,11 +1254,11 @@ cleanup:
 }
 
 void
-virHostdevReAttachUSBHostdevs(virHostdevManagerPtr hostdev_mgr,
-                              const char *drv_name,
-                              const char *dom_name,
-                              virDomainHostdevDefPtr *hostdevs,
-                              int nhostdevs)
+virHostdevReAttachUSBDevices(virHostdevManagerPtr hostdev_mgr,
+                             const char *drv_name,
+                             const char *dom_name,
+                             virDomainHostdevDefPtr *hostdevs,
+                             int nhostdevs)
 {
     size_t i;
 
@@ -1320,11 +1320,11 @@ virHostdevReAttachUSBHostdevs(virHostdevManagerPtr hostdev_mgr,
 }
 
 void
-virHostdevReAttachSCSIHostdevs(virHostdevManagerPtr hostdev_mgr,
-                               const char *drv_name,
-                               const char *dom_name,
-                               virDomainHostdevDefPtr *hostdevs,
-                               int nhostdevs)
+virHostdevReAttachSCSIDevices(virHostdevManagerPtr hostdev_mgr,
+                              const char *drv_name,
+                              const char *dom_name,
+                              virDomainHostdevDefPtr *hostdevs,
+                              int nhostdevs)
 {
     size_t i;
 
diff --git a/src/util/virhostdev.h b/src/util/virhostdev.h
index 05bec7ced2c4d395871743073947a24644cb1b15..4f11fbb87028af37e5370dd769a3b88175761b63 100644
--- a/src/util/virhostdev.h
+++ b/src/util/virhostdev.h
@@ -79,29 +79,29 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr hostdev_mgr,
                              int nhostdevs,
                              const char *oldStateDir);
 void
-virHostdevReAttachUSBHostdevs(virHostdevManagerPtr hostdev_mgr,
+virHostdevReAttachUSBDevices(virHostdevManagerPtr hostdev_mgr,
                               const char *drv_name,
                               const char *dom_name,
                               virDomainHostdevDefPtr *hostdevs,
                               int nhostdevs);
 void
-virHostdevReAttachSCSIHostdevs(virHostdevManagerPtr hostdev_mgr,
-                               const char *drv_name,
-                               const char *dom_name,
-                               virDomainHostdevDefPtr *hostdevs,
-                               int nhostdevs);
+virHostdevReAttachSCSIDevices(virHostdevManagerPtr hostdev_mgr,
+                              const char *drv_name,
+                              const char *dom_name,
+                              virDomainHostdevDefPtr *hostdevs,
+                              int nhostdevs);
 int
-virHostdevUpdateActivePCIHostdevs(virHostdevManagerPtr mgr,
-                                  const char *drv_name,
-                                  virDomainDefPtr def);
+virHostdevUpdateActivePCIDevices(virHostdevManagerPtr mgr,
+                                 const char *drv_name,
+                                 virDomainDefPtr def);
 int
-virHostdevUpdateActiveUSBHostdevs(virHostdevManagerPtr mgr,
+virHostdevUpdateActiveUSBDevices(virHostdevManagerPtr mgr,
+                                 const char *drv_name,
+                                 virDomainDefPtr def);
+int
+virHostdevUpdateActiveSCSIDevices(virHostdevManagerPtr mgr,
                                   const char *drv_name,
                                   virDomainDefPtr def);
-int
-virHostdevUpdateActiveSCSIHostdevs(virHostdevManagerPtr mgr,
-                                   const char *drv_name,
-                                   virDomainDefPtr def);
 
 /* functions used by NodeDevDetach/Reattach/Reset */
 int virHostdevPCINodeDeviceDetach(virHostdevManagerPtr mgr,