diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index e71f37d2b18d309d30daa36846fad52135ad4a6b..d13f2adde507b23919ed64778474e14e967f3996 100644
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -374,7 +374,7 @@ static int virLXCCgroupSetupDeviceACL(virDomainDefPtr def,
             return -1;
     }
 
-    VIR_DEBUG("Device whitelist complete");
+    VIR_DEBUG("Device ACL setup complete");
 
     return 0;
 }
diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
index 404961c53e43c60eb3b5f7f8761e7b243001b74d..f89dbd2c3af356d4dcdff33b164cd740a0b603ce 100644
--- a/src/qemu/qemu.conf
+++ b/src/qemu/qemu.conf
@@ -464,7 +464,7 @@
 # What cgroup controllers to make use of with QEMU guests
 #
 #  - 'cpu' - use for scheduler tunables
-#  - 'devices' - use for device whitelisting
+#  - 'devices' - use for device access control
 #  - 'memory' - use for memory tunables
 #  - 'blkio' - use for block devices I/O tunables
 #  - 'cpuset' - use for CPUs and memory nodes
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index eb0f03d4aa07cdd2fa9487e8f8731aeda0ffa539..914bf640ca7f9ef66dabc0eea55de7410ce0a2b6 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -745,7 +745,7 @@ qemuSetupDevicesCgroup(virDomainObjPtr vm)
     if (rv < 0) {
         if (virLastErrorIsSystemErrno(EPERM)) {
             virResetLastError();
-            VIR_WARN("Group devices ACL is not accessible, disabling whitelisting");
+            VIR_WARN("Group devices ACL is not accessible, disabling filtering");
             return 0;
         }
 
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index bb535df4f2ac0804499968594fb76a42fa4e601f..e20cc71c787badce30df25b9e62031a3be1677c1 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -773,7 +773,7 @@ virCgroupSetPartitionSuffix(const char *path, char **res)
         return ret;
 
     for (i = 0; tokens[i] != NULL; i++) {
-        /* Whitelist the 3 top level fixed dirs
+        /* Special case the 3 top level fixed dirs
          * NB i == 0 is "", since we have leading '/'
          */
         if (i == 1 &&