diff --git a/src/ch/meson.build b/src/ch/meson.build
index 0ef7288257..df246ef9b0 100644
--- a/src/ch/meson.build
+++ b/src/ch/meson.build
@@ -57,7 +57,7 @@ if conf.has('WITH_CH')
 
   virt_daemon_units += {
     'service': 'virtchd',
-    'name': 'Libvirt ch',
+    'name': 'Cloud Hypervisor',
     'service_extra_in': files('virtchd.service.extra.in'),
   }
 
diff --git a/src/interface/meson.build b/src/interface/meson.build
index 54c0b1a935..b1617d83e6 100644
--- a/src/interface/meson.build
+++ b/src/interface/meson.build
@@ -44,7 +44,7 @@ if conf.has('WITH_INTERFACE')
 
   virt_daemon_units += {
     'service': 'virtinterfaced',
-    'name': 'Libvirt interface',
+    'name': 'interface',
   }
 
   openrc_init_files += {
diff --git a/src/libxl/meson.build b/src/libxl/meson.build
index 171d6ca005..8e6f455139 100644
--- a/src/libxl/meson.build
+++ b/src/libxl/meson.build
@@ -66,7 +66,7 @@ if conf.has('WITH_LIBXL')
 
   virt_daemon_units += {
     'service': 'virtxend',
-    'name': 'Libvirt libxl',
+    'name': 'Xen',
     'service_extra_in': files('virtxend.service.extra.in'),
     'socket_extra_in': files('virtxend.socket.extra.in'),
   }
diff --git a/src/locking/meson.build b/src/locking/meson.build
index 2ccc822ed3..6b3cd781d1 100644
--- a/src/locking/meson.build
+++ b/src/locking/meson.build
@@ -144,7 +144,7 @@ if conf.has('WITH_LIBVIRTD')
   virt_daemon_units += {
     'service': 'virtlockd',
     'service_in': files('virtlockd.service.in'),
-    'name': 'Libvirt locking',
+    'name': 'locking',
     'sockets': [ 'main', 'admin' ],
     'socket_in': files('virtlockd.socket.in'),
     'socket_admin_in': files('virtlockd-admin.socket.in'),
diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-admin.socket.in
index 0452a0cfdb..ed5b94edba 100644
--- a/src/locking/virtlockd-admin.socket.in
+++ b/src/locking/virtlockd-admin.socket.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=Virtual machine lock manager admin socket
+Description=libvirt locking daemon admin socket
 BindsTo=virtlockd.socket
 After=virtlockd.socket
 
diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
index 20b4b26f35..290a2887a5 100644
--- a/src/locking/virtlockd.service.in
+++ b/src/locking/virtlockd.service.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=Virtual machine lock manager
+Description=libvirt locking daemon
 BindsTo=virtlockd.socket
 Wants=virtlockd-admin.socket
 After=virtlockd.socket
diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in
index 31a576aa16..4eec90a95e 100644
--- a/src/locking/virtlockd.socket.in
+++ b/src/locking/virtlockd.socket.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=Virtual machine lock manager socket
+Description=libvirt locking daemon socket
 
 [Socket]
 ListenStream=@runstatedir@/libvirt/virtlockd-sock
diff --git a/src/logging/meson.build b/src/logging/meson.build
index 95d2ef2a3f..1527f91faf 100644
--- a/src/logging/meson.build
+++ b/src/logging/meson.build
@@ -91,7 +91,7 @@ if conf.has('WITH_LIBVIRTD')
   virt_daemon_units += {
     'service': 'virtlogd',
     'service_in': files('virtlogd.service.in'),
-    'name': 'Libvirt logging',
+    'name': 'logging',
     'sockets': [ 'main', 'admin' ],
     'socket_in': files('virtlogd.socket.in'),
     'socket_admin_in': files('virtlogd-admin.socket.in'),
diff --git a/src/logging/virtlogd-admin.socket.in b/src/logging/virtlogd-admin.socket.in
index ddb9a1393b..7207878008 100644
--- a/src/logging/virtlogd-admin.socket.in
+++ b/src/logging/virtlogd-admin.socket.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=Virtual machine log manager socket
+Description=libvirt logging daemon admin socket
 BindsTo=virtlogd.socket
 After=virtlogd.socket
 
diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
index 776d753e9a..4289ef1cb4 100644
--- a/src/logging/virtlogd.service.in
+++ b/src/logging/virtlogd.service.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=Virtual machine log manager
+Description=libvirt logging daemon
 BindsTo=virtlogd.socket
 Wants=virtlogd-admin.socket
 After=virtlogd.socket
diff --git a/src/logging/virtlogd.socket.in b/src/logging/virtlogd.socket.in
index 084cbe179d..e1d6e30e4d 100644
--- a/src/logging/virtlogd.socket.in
+++ b/src/logging/virtlogd.socket.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=Virtual machine log manager socket
+Description=libvirt logging daemon socket
 
 [Socket]
 ListenStream=@runstatedir@/libvirt/virtlogd-sock
diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index 84e6c313ea..5eb23fbbbf 100644
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -164,7 +164,7 @@ if conf.has('WITH_LXC')
 
   virt_daemon_units += {
     'service': 'virtlxcd',
-    'name': 'Libvirt lxc',
+    'name': 'LXC',
     'service_extra_in': files('virtlxcd.service.extra.in'),
   }
 
diff --git a/src/network/meson.build b/src/network/meson.build
index ed7707c714..d0383cca1c 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -62,7 +62,7 @@ if conf.has('WITH_NETWORK')
 
   virt_daemon_units += {
     'service': 'virtnetworkd',
-    'name': 'Libvirt network',
+    'name': 'network',
     'service_extra_in': files('virtnetworkd.service.extra.in'),
   }
 
diff --git a/src/node_device/meson.build b/src/node_device/meson.build
index 2614ff8b9c..d1e349bc5e 100644
--- a/src/node_device/meson.build
+++ b/src/node_device/meson.build
@@ -52,7 +52,7 @@ if conf.has('WITH_NODE_DEVICES')
 
   virt_daemon_units += {
     'service': 'virtnodedevd',
-    'name': 'Libvirt nodedev',
+    'name': 'nodedev',
   }
 
   openrc_init_files += {
diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build
index c091bc3f1b..1b914f2360 100644
--- a/src/nwfilter/meson.build
+++ b/src/nwfilter/meson.build
@@ -50,7 +50,7 @@ if conf.has('WITH_NWFILTER')
 
   virt_daemon_units += {
     'service': 'virtnwfilterd',
-    'name': 'Libvirt nwfilter',
+    'name': 'nwfilter',
   }
 
   openrc_init_files += {
diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 1afc301a6d..64c62e584f 100644
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -183,7 +183,7 @@ if conf.has('WITH_QEMU')
 
   virt_daemon_units += {
     'service': 'virtqemud',
-    'name': 'Libvirt qemu',
+    'name': 'QEMU',
     'service_extra_in': files('virtqemud.service.extra.in'),
   }
 
diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admin.socket.in
index e0bbf9b1ac..37efc11357 100644
--- a/src/remote/libvirtd-admin.socket.in
+++ b/src/remote/libvirtd-admin.socket.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ admin socket
+Description=libvirt legacy monolithic daemon admin socket
 BindsTo=libvirtd.socket
 After=libvirtd.socket
 
diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.socket.in
index c8adc8109b..6e1fad2272 100644
--- a/src/remote/libvirtd-ro.socket.in
+++ b/src/remote/libvirtd-ro.socket.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ local read-only socket
+Description=libvirt legacy monolithic daemon read-only socket
 BindsTo=libvirtd.socket
 After=libvirtd.socket
 
diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.socket.in
index 8b8fbcd01a..9bdb47285e 100644
--- a/src/remote/libvirtd-tcp.socket.in
+++ b/src/remote/libvirtd-tcp.socket.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ non-TLS IP socket
+Description=libvirt legacy monolithic daemon non-TLS IP socket
 BindsTo=libvirtd.socket
 After=libvirtd.socket
 
diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.socket.in
index fefda22c6b..3b10c3e4c2 100644
--- a/src/remote/libvirtd-tls.socket.in
+++ b/src/remote/libvirtd-tls.socket.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ TLS IP socket
+Description=libvirt legacy monolithic daemon TLS IP socket
 BindsTo=libvirtd.socket
 After=libvirtd.socket
 
diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
index a2c3c8f8fa..9e303f29c8 100644
--- a/src/remote/libvirtd.service.in
+++ b/src/remote/libvirtd.service.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=Virtualization daemon
+Description=libvirt legacy monolithic daemon
 # Use Wants instead of Requires so that users
 # can disable these three .socket units to revert
 # to a traditional non-activation deployment setup
diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in
index f483facdf3..9cd37dc766 100644
--- a/src/remote/libvirtd.socket.in
+++ b/src/remote/libvirtd.socket.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ local socket
+Description=libvirt legacy monolithic daemon socket
 
 [Socket]
 ListenStream=@runstatedir@/libvirt/libvirt-sock
diff --git a/src/remote/meson.build b/src/remote/meson.build
index 5ee6d4e61c..e14541f09e 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -191,7 +191,7 @@ if conf.has('WITH_REMOTE')
     virt_daemon_units += {
       'service': 'libvirtd',
       'service_in': files('libvirtd.service.in'),
-      'name': 'Libvirt',
+      'name': 'legacy monolithic',
       'sockprefix': 'libvirt',
       'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
       'socket_in': files('libvirtd.socket.in'),
@@ -224,7 +224,7 @@ if conf.has('WITH_REMOTE')
 
     virt_daemon_units += {
       'service': 'virtproxyd',
-      'name': 'Libvirt proxy',
+      'name': 'proxy',
       'sockprefix': 'libvirt',
       'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
     }
diff --git a/src/secret/meson.build b/src/secret/meson.build
index e05b46abea..791ce1a024 100644
--- a/src/secret/meson.build
+++ b/src/secret/meson.build
@@ -33,7 +33,7 @@ if conf.has('WITH_SECRETS')
 
   virt_daemon_units += {
     'service': 'virtsecretd',
-    'name': 'Libvirt secret',
+    'name': 'secret',
   }
 
   openrc_init_files += {
diff --git a/src/storage/meson.build b/src/storage/meson.build
index fb7feea81d..023353c1d6 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -111,7 +111,7 @@ if conf.has('WITH_STORAGE')
 
   virt_daemon_units += {
     'service': 'virtstoraged',
-    'name': 'Libvirt storage',
+    'name': 'storage',
     'service_extra_in': files('virtstoraged.service.extra.in'),
   }
 
diff --git a/src/vbox/meson.build b/src/vbox/meson.build
index ee6efbdb42..a72c1833f1 100644
--- a/src/vbox/meson.build
+++ b/src/vbox/meson.build
@@ -57,7 +57,7 @@ if conf.has('WITH_VBOX')
 
   virt_daemon_units += {
     'service': 'virtvboxd',
-    'name': 'Libvirt vbox',
+    'name': 'VirtualBox',
     'service_extra_in': files('virtvboxd.service.extra.in'),
   }
 
diff --git a/src/virtd-admin.socket.in b/src/virtd-admin.socket.in
index 818d4ab84f..63eabd70f8 100644
--- a/src/virtd-admin.socket.in
+++ b/src/virtd-admin.socket.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ admin socket
+Description=libvirt @name@ daemon admin socket
 BindsTo=@service@.socket
 After=@service@.socket
 Conflicts=libvirtd-admin.socket
diff --git a/src/virtd-ro.socket.in b/src/virtd-ro.socket.in
index 57b313e016..3284af5a4a 100644
--- a/src/virtd-ro.socket.in
+++ b/src/virtd-ro.socket.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ local read-only socket
+Description=libvirt @name@ daemon read-only socket
 BindsTo=@service@.socket
 After=@service@.socket
 Conflicts=libvirtd-ro.socket
diff --git a/src/virtd-tcp.socket.in b/src/virtd-tcp.socket.in
index 10480d64e3..f58cb0b358 100644
--- a/src/virtd-tcp.socket.in
+++ b/src/virtd-tcp.socket.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ non-TLS IP socket
+Description=libvirt @name@ daemon non-TLS IP socket
 BindsTo=@service@.socket
 After=@service@.socket
 Conflicts=libvirtd-tcp.socket
diff --git a/src/virtd-tls.socket.in b/src/virtd-tls.socket.in
index 83a1e343bc..135bf6e137 100644
--- a/src/virtd-tls.socket.in
+++ b/src/virtd-tls.socket.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ TLS IP socket
+Description=libvirt @name@ daemon TLS IP socket
 BindsTo=@service@.socket
 After=@service@.socket
 Conflicts=libvirtd-tls.socket
diff --git a/src/virtd.service.in b/src/virtd.service.in
index e1a5814b13..91ac4478bd 100644
--- a/src/virtd.service.in
+++ b/src/virtd.service.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ daemon
+Description=libvirt @name@ daemon
 BindsTo=@service@.socket
 Wants=@service@-ro.socket
 Wants=@service@-admin.socket
diff --git a/src/virtd.socket.in b/src/virtd.socket.in
index 7a8c4bf0c2..502c792e7d 100644
--- a/src/virtd.socket.in
+++ b/src/virtd.socket.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=@name@ local socket
+Description=libvirt @name@ daemon socket
 Conflicts=libvirtd.socket
 After=libvirtd.socket
 
diff --git a/src/vz/meson.build b/src/vz/meson.build
index 842cdb6136..ce2cbae454 100644
--- a/src/vz/meson.build
+++ b/src/vz/meson.build
@@ -48,7 +48,7 @@ if conf.has('WITH_VZ')
 
   virt_daemon_units += {
     'service': 'virtvzd',
-    'name': 'Libvirt vz',
+    'name': 'vz',
     'service_extra_in': files('virtvzd.service.extra.in'),
   }