From 3425419f0ef0fef5527e5737842cd5bc52e56bff Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Wed, 6 Dec 2023 19:38:47 +0000
Subject: [PATCH] feat(dbus):  rename dbus abstractions.

---
 apparmor.d/groups/apps/calibre                |  4 +--
 apparmor.d/groups/apt/apt                     |  5 +--
 apparmor.d/groups/apt/unattended-upgrade      |  4 ++-
 .../groups/apt/unattended-upgrade-shutdown    |  4 +--
 apparmor.d/groups/avahi/avahi-browse          |  2 +-
 apparmor.d/groups/avahi/avahi-resolve         |  2 +-
 apparmor.d/groups/browsers/firefox            |  9 ++---
 apparmor.d/groups/bus/ibus-daemon             |  2 +-
 apparmor.d/groups/bus/ibus-extension-gtk3     |  2 +-
 apparmor.d/groups/bus/ibus-x11                |  2 +-
 apparmor.d/groups/freedesktop/accounts-daemon |  2 +-
 .../groups/freedesktop/at-spi2-registryd      |  4 +--
 apparmor.d/groups/freedesktop/colord          |  2 +-
 apparmor.d/groups/freedesktop/colord-sane     |  2 +-
 apparmor.d/groups/freedesktop/geoclue         |  8 ++---
 apparmor.d/groups/freedesktop/pipewire        |  2 +-
 .../groups/freedesktop/pipewire-media-session |  2 +-
 apparmor.d/groups/freedesktop/pulseaudio      |  8 ++---
 apparmor.d/groups/freedesktop/upowerd         |  4 +--
 apparmor.d/groups/freedesktop/xdg-dbus-proxy  |  6 ++--
 .../freedesktop/xdg-desktop-portal-gnome      |  7 ++--
 .../groups/freedesktop/xdg-desktop-portal-gtk | 14 ++++----
 .../groups/freedesktop/xdg-document-portal    |  1 +
 apparmor.d/groups/freedesktop/xorg            |  2 +-
 .../gnome/evolution-addressbook-factory       |  6 ++--
 .../groups/gnome/evolution-alarm-notify       |  6 ++--
 .../groups/gnome/evolution-calendar-factory   |  3 +-
 .../groups/gnome/evolution-source-registry    |  2 +-
 apparmor.d/groups/gnome/gdm-session-worker    |  2 +-
 apparmor.d/groups/gnome/gdm-wayland-session   |  2 +-
 apparmor.d/groups/gnome/gnome-calendar        |  8 ++---
 apparmor.d/groups/gnome/gnome-characters      |  2 +-
 apparmor.d/groups/gnome/gnome-control-center  |  2 +-
 .../gnome/gnome-control-center-goa-helper     |  4 +--
 .../gnome/gnome-control-center-print-renderer |  2 +-
 apparmor.d/groups/gnome/gnome-extension-ding  | 12 ++++---
 apparmor.d/groups/gnome/gnome-keyring-daemon  |  6 ++--
 apparmor.d/groups/gnome/gnome-session-binary  | 10 +++---
 apparmor.d/groups/gnome/gnome-shell           | 34 +++++++++++++------
 apparmor.d/groups/gnome/gnome-terminal-server |  6 ++--
 apparmor.d/groups/gnome/goa-daemon            |  2 +-
 apparmor.d/groups/gnome/gsd-a11y-settings     |  2 +-
 apparmor.d/groups/gnome/gsd-color             |  8 +++--
 apparmor.d/groups/gnome/gsd-datetime          |  2 +-
 .../groups/gnome/gsd-disk-utility-notify      |  2 +-
 apparmor.d/groups/gnome/gsd-housekeeping      |  4 +--
 apparmor.d/groups/gnome/gsd-keyboard          |  8 ++---
 apparmor.d/groups/gnome/gsd-media-keys        | 10 +++---
 apparmor.d/groups/gnome/gsd-power             | 16 +++++----
 .../groups/gnome/gsd-print-notifications      |  4 +--
 apparmor.d/groups/gnome/gsd-printer           |  2 +-
 apparmor.d/groups/gnome/gsd-rfkill            |  8 ++---
 apparmor.d/groups/gnome/gsd-screensaver-proxy |  2 +-
 apparmor.d/groups/gnome/gsd-sharing           |  4 +--
 apparmor.d/groups/gnome/gsd-smartcard         |  2 +-
 apparmor.d/groups/gnome/gsd-sound             |  4 +--
 apparmor.d/groups/gnome/gsd-wacom             |  6 ++--
 apparmor.d/groups/gnome/gsd-xsettings         |  9 ++---
 apparmor.d/groups/gnome/nautilus              |  6 ++--
 apparmor.d/groups/gnome/seahorse              |  6 ++--
 apparmor.d/groups/gnome/tracker-extract       |  4 +--
 .../groups/gvfs/gvfs-udisks2-volume-monitor   |  4 +--
 apparmor.d/groups/gvfs/gvfsd-dnssd            |  4 +--
 apparmor.d/groups/gvfs/gvfsd-fuse             |  2 +-
 apparmor.d/groups/gvfs/gvfsd-smb-browse       |  2 +-
 apparmor.d/groups/kde/kded5                   |  2 +-
 apparmor.d/groups/kde/plasmashell             |  2 +-
 apparmor.d/groups/network/ModemManager        |  4 +--
 apparmor.d/groups/network/NetworkManager      | 15 ++++----
 apparmor.d/groups/systemd/hostnamectl         |  2 +-
 apparmor.d/groups/systemd/loginctl            |  4 +--
 apparmor.d/groups/systemd/systemd-hostnamed   |  2 +-
 apparmor.d/groups/systemd/systemd-logind      |  2 +-
 apparmor.d/groups/systemd/systemd-networkd    |  2 +-
 apparmor.d/groups/systemd/systemd-resolved    |  2 +-
 .../groups/systemd/systemd-user-runtime-dir   |  2 +-
 .../groups/ubuntu/check-new-release-gtk       |  2 +-
 .../groups/ubuntu/software-properties-gtk     |  2 ++
 .../ubuntu/ubuntu-advantage-notification      |  2 +-
 apparmor.d/groups/ubuntu/update-manager       |  6 ++--
 apparmor.d/groups/ubuntu/update-notifier      |  2 +-
 apparmor.d/profiles-a-f/atril                 |  4 +--
 apparmor.d/profiles-a-f/boltd                 |  2 +-
 apparmor.d/profiles-a-f/cups-backend-dnssd    |  1 +
 apparmor.d/profiles-a-f/cups-browsed          |  2 ++
 .../profiles-a-f/cups-pk-helper-mechanism     |  2 +-
 apparmor.d/profiles-a-f/cupsd                 |  3 +-
 apparmor.d/profiles-a-f/engrampa              |  4 +--
 apparmor.d/profiles-a-f/evince                |  4 +--
 apparmor.d/profiles-a-f/fprintd               |  2 +-
 apparmor.d/profiles-a-f/fwupd                 |  8 ++---
 apparmor.d/profiles-g-l/login                 |  2 +-
 apparmor.d/profiles-m-r/murmurd               |  2 +-
 .../profiles-m-r/needrestart-apt-pinvoke      |  2 +-
 apparmor.d/profiles-m-r/packagekitd           |  5 +--
 apparmor.d/profiles-m-r/pkexec                |  2 +-
 apparmor.d/profiles-m-r/pkttyagent            |  2 +-
 apparmor.d/profiles-m-r/power-profiles-daemon |  4 +--
 apparmor.d/profiles-m-r/qbittorrent           |  2 +-
 apparmor.d/profiles-m-r/remmina               |  5 +--
 apparmor.d/profiles-m-r/rtkit-daemon          |  2 +-
 apparmor.d/profiles-m-r/rustdesk              |  2 +-
 apparmor.d/profiles-s-z/snapd                 |  2 +-
 apparmor.d/profiles-s-z/spice-vdagent         |  7 ++--
 apparmor.d/profiles-s-z/spice-vdagentd        |  2 +-
 apparmor.d/profiles-s-z/system-config-printer |  4 +--
 apparmor.d/profiles-s-z/thermald              |  3 +-
 apparmor.d/profiles-s-z/thunderbird           |  6 ++--
 apparmor.d/profiles-s-z/udisksd               |  4 +--
 apparmor.d/profiles-s-z/vlc                   |  7 ++--
 apparmor.d/profiles-s-z/wireplumber           |  4 +--
 apparmor.d/profiles-s-z/zsysd                 |  2 +-
 112 files changed, 263 insertions(+), 223 deletions(-)

diff --git a/apparmor.d/groups/apps/calibre b/apparmor.d/groups/apps/calibre
index 99a0c4e61..e2561214e 100644
--- a/apparmor.d/groups/apps/calibre
+++ b/apparmor.d/groups/apps/calibre
@@ -15,8 +15,8 @@ include <tunables/global>
 @{exec_path} += @{bin}/web2disk
 profile calibre @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/chromium-common>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
diff --git a/apparmor.d/groups/apt/apt b/apparmor.d/groups/apt/apt
index 5aaf70c9d..7ea11864a 100644
--- a/apparmor.d/groups/apt/apt
+++ b/apparmor.d/groups/apt/apt
@@ -11,8 +11,9 @@ include <tunables/global>
 profile apt @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/apt-common>
-  include <abstractions/bus/login>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.login1>
+  include <abstractions/bus/org.freedesktop.PackageKit>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/consoles>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/apt/unattended-upgrade b/apparmor.d/groups/apt/unattended-upgrade
index 472dc5afb..c252cb762 100644
--- a/apparmor.d/groups/apt/unattended-upgrade
+++ b/apparmor.d/groups/apt/unattended-upgrade
@@ -11,7 +11,9 @@ include <tunables/global>
 profile unattended-upgrade @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/apt-common>
-  include <abstractions/bus/login>
+  include <abstractions/bus/org.freedesktop.login1>
+  include <abstractions/bus/org.freedesktop.NetworkManager>
+  include <abstractions/bus/org.freedesktop.PackageKit>
   include <abstractions/consoles>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/apt/unattended-upgrade-shutdown b/apparmor.d/groups/apt/unattended-upgrade-shutdown
index 0f63cd8d4..0e0b0a3ae 100644
--- a/apparmor.d/groups/apt/unattended-upgrade-shutdown
+++ b/apparmor.d/groups/apt/unattended-upgrade-shutdown
@@ -9,8 +9,8 @@ include <tunables/global>
 @{exec_path} = /usr/share/unattended-upgrades/unattended-upgrade-shutdown
 profile unattended-upgrade-shutdown @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/login>
-  include <abstractions/bus/network-manager>
+  include <abstractions/bus/org.freedesktop.login1>
+  include <abstractions/bus/org.freedesktop.NetworkManager>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
   include <abstractions/python>
diff --git a/apparmor.d/groups/avahi/avahi-browse b/apparmor.d/groups/avahi/avahi-browse
index 822e1df7f..9a8c5062d 100644
--- a/apparmor.d/groups/avahi/avahi-browse
+++ b/apparmor.d/groups/avahi/avahi-browse
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/avahi-browse @{bin}/avahi-browse-domains
 profile avahi-browse @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/avahi>
+  include <abstractions/bus/org.freedesktop.Avahi>
   include <abstractions/consoles>
   include <abstractions/dbus-strict>
 
diff --git a/apparmor.d/groups/avahi/avahi-resolve b/apparmor.d/groups/avahi/avahi-resolve
index 7ad8604da..b378b2d83 100644
--- a/apparmor.d/groups/avahi/avahi-resolve
+++ b/apparmor.d/groups/avahi/avahi-resolve
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/avahi-resolve @{bin}/avahi-resolve-address @{bin}/avahi-resolve-host-name
 profile avahi-resolve @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/avahi>
+  include <abstractions/bus/org.freedesktop.Avahi>
   include <abstractions/consoles>
   include <abstractions/dbus-strict>
 
diff --git a/apparmor.d/groups/browsers/firefox b/apparmor.d/groups/browsers/firefox
index f44fb48c3..262088410 100644
--- a/apparmor.d/groups/browsers/firefox
+++ b/apparmor.d/groups/browsers/firefox
@@ -16,10 +16,11 @@ include <tunables/global>
 profile firefox @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/desktop>
-  include <abstractions/bus/login>
-  include <abstractions/bus/rtkit>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.FileManager1>
+  include <abstractions/bus/org.freedesktop.login1>
+  include <abstractions/bus/org.freedesktop.portal.Desktop>
+  include <abstractions/bus/org.freedesktop.RealtimeKit1>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/bus/ibus-daemon b/apparmor.d/groups/bus/ibus-daemon
index 572bac36a..b7f2d5c07 100644
--- a/apparmor.d/groups/bus/ibus-daemon
+++ b/apparmor.d/groups/bus/ibus-daemon
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/ibus-daemon
 profile ibus-daemon @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-session-strict>
   include <abstractions/ibus>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/bus/ibus-extension-gtk3 b/apparmor.d/groups/bus/ibus-extension-gtk3
index d5c00801e..c0c167d43 100644
--- a/apparmor.d/groups/bus/ibus-extension-gtk3
+++ b/apparmor.d/groups/bus/ibus-extension-gtk3
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,ibus/}ibus-extension-gtk3
 profile ibus-extension-gtk3 @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
+  include <abstractions/bus/org.a11y>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/bus/ibus-x11 b/apparmor.d/groups/bus/ibus-x11
index 8246a5428..d6fbe2453 100644
--- a/apparmor.d/groups/bus/ibus-x11
+++ b/apparmor.d/groups/bus/ibus-x11
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,ibus/}ibus-x11
 profile ibus-x11 @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
+  include <abstractions/bus/org.a11y>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dri-common>
diff --git a/apparmor.d/groups/freedesktop/accounts-daemon b/apparmor.d/groups/freedesktop/accounts-daemon
index 36dea8a16..032a39f2d 100644
--- a/apparmor.d/groups/freedesktop/accounts-daemon
+++ b/apparmor.d/groups/freedesktop/accounts-daemon
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,accountsservice/}accounts-daemon
 profile accounts-daemon @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
   include <abstractions/wutmp>
diff --git a/apparmor.d/groups/freedesktop/at-spi2-registryd b/apparmor.d/groups/freedesktop/at-spi2-registryd
index 3e7d18278..bd6dbe9e2 100644
--- a/apparmor.d/groups/freedesktop/at-spi2-registryd
+++ b/apparmor.d/groups/freedesktop/at-spi2-registryd
@@ -10,8 +10,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,at-spi2{,-core}/}at-spi2-registryd
 profile at-spi2-registryd @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/session-manager>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/freedesktop/colord b/apparmor.d/groups/freedesktop/colord
index d4463bbf0..aaa4a61ed 100644
--- a/apparmor.d/groups/freedesktop/colord
+++ b/apparmor.d/groups/freedesktop/colord
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,colord/}colord
 profile colord @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/dbus-strict>
   include <abstractions/devices-usb>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/freedesktop/colord-sane b/apparmor.d/groups/freedesktop/colord-sane
index b5149fcdf..b25c68f41 100644
--- a/apparmor.d/groups/freedesktop/colord-sane
+++ b/apparmor.d/groups/freedesktop/colord-sane
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,colord/}colord-sane
 profile colord-sane @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/avahi>
+  include <abstractions/bus/org.freedesktop.Avahi>
   include <abstractions/dbus-strict>
   include <abstractions/devices-usb>
   include <abstractions/openssl>
diff --git a/apparmor.d/groups/freedesktop/geoclue b/apparmor.d/groups/freedesktop/geoclue
index 3b6251b7e..12540c5ae 100644
--- a/apparmor.d/groups/freedesktop/geoclue
+++ b/apparmor.d/groups/freedesktop/geoclue
@@ -9,10 +9,10 @@ include <tunables/global>
 @{exec_path} = @{lib}/geoclue @{lib}/geoclue-2.0/demos/agent
 profile geoclue @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/avahi>
-  include <abstractions/bus/modem-manager>
-  include <abstractions/bus/network-manager>
-  include <abstractions/bus/wpa-supplicant>
+  include <abstractions/bus/fi.w1.wpa_supplicant1>
+  include <abstractions/bus/org.freedesktop.Avahi>
+  include <abstractions/bus/org.freedesktop.ModemManager1>
+  include <abstractions/bus/org.freedesktop.NetworkManager>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
   include <abstractions/p11-kit>
diff --git a/apparmor.d/groups/freedesktop/pipewire b/apparmor.d/groups/freedesktop/pipewire
index a5ec36fe9..0729b0f57 100644
--- a/apparmor.d/groups/freedesktop/pipewire
+++ b/apparmor.d/groups/freedesktop/pipewire
@@ -11,7 +11,7 @@ include <tunables/global>
 profile pipewire @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/bus/rtkit>
+  include <abstractions/bus/org.freedesktop.RealtimeKit1>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/freedesktop/pipewire-media-session b/apparmor.d/groups/freedesktop/pipewire-media-session
index 24dcd5cfb..eec008484 100644
--- a/apparmor.d/groups/freedesktop/pipewire-media-session
+++ b/apparmor.d/groups/freedesktop/pipewire-media-session
@@ -11,7 +11,7 @@ include <tunables/global>
 profile pipewire-media-session @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/bus/rtkit>
+  include <abstractions/bus/org.freedesktop.RealtimeKit1>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/devices-usb>
diff --git a/apparmor.d/groups/freedesktop/pulseaudio b/apparmor.d/groups/freedesktop/pulseaudio
index 9fa3b7b74..1c6d6894b 100644
--- a/apparmor.d/groups/freedesktop/pulseaudio
+++ b/apparmor.d/groups/freedesktop/pulseaudio
@@ -12,10 +12,10 @@ include <tunables/global>
 profile pulseaudio @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/bus/avahi>
-  include <abstractions/bus/bluetooth>
-  include <abstractions/bus/hostname>
-  include <abstractions/bus/rtkit>
+  include <abstractions/bus/org.bluez>
+  include <abstractions/bus/org.freedesktop.Avahi>
+  include <abstractions/bus/org.freedesktop.hostname1>
+  include <abstractions/bus/org.freedesktop.RealtimeKit1>
   include <abstractions/consoles>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/groups/freedesktop/upowerd b/apparmor.d/groups/freedesktop/upowerd
index 1e032f82a..9e762e76b 100644
--- a/apparmor.d/groups/freedesktop/upowerd
+++ b/apparmor.d/groups/freedesktop/upowerd
@@ -10,8 +10,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,upower/}upowerd
 profile upowerd @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/bluetooth>
-  include <abstractions/bus/login>
+  include <abstractions/bus/org.bluez>
+  include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/dbus-strict>
   include <abstractions/devices-usb>
 
diff --git a/apparmor.d/groups/freedesktop/xdg-dbus-proxy b/apparmor.d/groups/freedesktop/xdg-dbus-proxy
index 79711fa7f..ba2fbe846 100644
--- a/apparmor.d/groups/freedesktop/xdg-dbus-proxy
+++ b/apparmor.d/groups/freedesktop/xdg-dbus-proxy
@@ -9,9 +9,9 @@ include <tunables/global>
 @{exec_path} = @{bin}/xdg-dbus-proxy
 profile xdg-dbus-proxy @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/avahi>
-  include <abstractions/bus/desktop>
-  include <abstractions/bus/network-manager>
+  include <abstractions/bus/org.freedesktop.Avahi>
+  include <abstractions/bus/org.freedesktop.NetworkManager>
+  include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/groups/freedesktop/xdg-desktop-portal-gnome b/apparmor.d/groups/freedesktop/xdg-desktop-portal-gnome
index 14a3ef38a..d68daedcd 100644
--- a/apparmor.d/groups/freedesktop/xdg-desktop-portal-gnome
+++ b/apparmor.d/groups/freedesktop/xdg-desktop-portal-gnome
@@ -9,9 +9,10 @@ include <tunables/global>
 @{exec_path} = @{lib}/xdg-desktop-portal-gnome
 profile xdg-desktop-portal-gnome @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/account-daemon>
-  include <abstractions/bus/desktop>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.freedesktop.Accounts>
+  include <abstractions/bus/org.freedesktop.portal.Desktop>
+  include <abstractions/bus/org.gnome.Mutter.DisplayConfig>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/freedesktop/xdg-desktop-portal-gtk b/apparmor.d/groups/freedesktop/xdg-desktop-portal-gtk
index ad24af649..6e43e90e5 100644
--- a/apparmor.d/groups/freedesktop/xdg-desktop-portal-gtk
+++ b/apparmor.d/groups/freedesktop/xdg-desktop-portal-gtk
@@ -9,13 +9,13 @@ include <tunables/global>
 @{exec_path} = @{lib}/xdg-desktop-portal-gtk
 profile xdg-desktop-portal-gtk @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/account-daemon>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/desktop>
-  include <abstractions/bus/gnome-screensaver>
-  include <abstractions/bus/network-manager>
-  include <abstractions/bus/session-manager>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.Accounts>
+  include <abstractions/bus/org.freedesktop.NetworkManager>
+  include <abstractions/bus/org.freedesktop.portal.Desktop>
+  include <abstractions/bus/org.gnome.ScreenSaver>
+  include <abstractions/bus/org.gnome.SessionManager>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/groups/freedesktop/xdg-document-portal b/apparmor.d/groups/freedesktop/xdg-document-portal
index 1d289052b..a8043ec9f 100644
--- a/apparmor.d/groups/freedesktop/xdg-document-portal
+++ b/apparmor.d/groups/freedesktop/xdg-document-portal
@@ -9,6 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/xdg-document-portal
 profile xdg-document-portal @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
+  include <abstractions/bus/org.freedesktop.impl.portal.PermissionStore>
   include <abstractions/dbus-session-strict>
 
   capability sys_nice,
diff --git a/apparmor.d/groups/freedesktop/xorg b/apparmor.d/groups/freedesktop/xorg
index a47ffa4ed..718e4dd56 100644
--- a/apparmor.d/groups/freedesktop/xorg
+++ b/apparmor.d/groups/freedesktop/xorg
@@ -13,7 +13,7 @@ include <tunables/global>
 @{exec_path} += @{lib}/xorg/Xorg{,.wrap}
 profile xorg @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/login-session>
+  include <abstractions/bus/org.freedesktop.login1.Session>
   include <abstractions/dbus-strict>
   include <abstractions/fontconfig-cache-read>
   include <abstractions/fonts>
diff --git a/apparmor.d/groups/gnome/evolution-addressbook-factory b/apparmor.d/groups/gnome/evolution-addressbook-factory
index 4141c2818..c87177a04 100644
--- a/apparmor.d/groups/gnome/evolution-addressbook-factory
+++ b/apparmor.d/groups/gnome/evolution-addressbook-factory
@@ -9,9 +9,9 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,evolution-data-server/}evolution-addressbook-factory
 profile evolution-addressbook-factory @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/locale>
-  include <abstractions/bus/network-manager>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.freedesktop.locale1>
+  include <abstractions/bus/org.freedesktop.NetworkManager>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/gnome/evolution-alarm-notify b/apparmor.d/groups/gnome/evolution-alarm-notify
index 45d9b5b9c..c0f619249 100644
--- a/apparmor.d/groups/gnome/evolution-alarm-notify
+++ b/apparmor.d/groups/gnome/evolution-alarm-notify
@@ -9,9 +9,9 @@ include <tunables/global>
 @{exec_path} = @{lib}/evolution-data-server/{,evolution-data-server/}evolution-alarm-notify
 profile evolution-alarm-notify @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
-  include <abstractions/dbus-accessibility-strict>
-  include <abstractions/dbus-session-strict>
+  include <abstractions/bus/accessibility>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/session>
   include <abstractions/dconf-write>
   include <abstractions/fontconfig-cache-read>
   include <abstractions/gnome>
diff --git a/apparmor.d/groups/gnome/evolution-calendar-factory b/apparmor.d/groups/gnome/evolution-calendar-factory
index 0c1572412..85ed04f2e 100644
--- a/apparmor.d/groups/gnome/evolution-calendar-factory
+++ b/apparmor.d/groups/gnome/evolution-calendar-factory
@@ -9,7 +9,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,evolution-data-server/}evolution-calendar-factory
 profile evolution-calendar-factory @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/network-manager>
+  include <abstractions/bus/org.freedesktop.NetworkManager>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/gnome/evolution-source-registry b/apparmor.d/groups/gnome/evolution-source-registry
index f85c52ace..65fced962 100644
--- a/apparmor.d/groups/gnome/evolution-source-registry
+++ b/apparmor.d/groups/gnome/evolution-source-registry
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,evolution-data-server/}evolution-source-registry
 profile evolution-source-registry @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/gnome/gdm-session-worker b/apparmor.d/groups/gnome/gdm-session-worker
index e4dbe258d..5157fbbca 100644
--- a/apparmor.d/groups/gnome/gdm-session-worker
+++ b/apparmor.d/groups/gnome/gdm-session-worker
@@ -10,7 +10,7 @@ include <tunables/global>
 profile gdm-session-worker @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/authentication>
-  include <abstractions/bus/account-daemon>
+  include <abstractions/bus/org.freedesktop.Accounts>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/gnome/gdm-wayland-session b/apparmor.d/groups/gnome/gdm-wayland-session
index 294aae659..6acdb444b 100644
--- a/apparmor.d/groups/gnome/gdm-wayland-session
+++ b/apparmor.d/groups/gnome/gdm-wayland-session
@@ -10,7 +10,7 @@ include <tunables/global>
 profile gdm-wayland-session @{exec_path} {
   include <abstractions/base>
   include <abstractions/bash>
-  include <abstractions/bus/systemd-session>
+  include <abstractions/bus/org.freedesktop.systemd1-session>
   include <abstractions/consoles>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/groups/gnome/gnome-calendar b/apparmor.d/groups/gnome/gnome-calendar
index 106df9755..f8a185a0a 100644
--- a/apparmor.d/groups/gnome/gnome-calendar
+++ b/apparmor.d/groups/gnome/gnome-calendar
@@ -9,10 +9,10 @@ include <tunables/global>
 @{exec_path} = @{bin}/gnome-calendar
 profile gnome-calendar @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/desktop>
-  include <abstractions/bus/login>
-  include <abstractions/bus/network-manager>
-  include <abstractions/bus/timedate>
+  include <abstractions/bus/org.freedesktop.login1>
+  include <abstractions/bus/org.freedesktop.NetworkManager>
+  include <abstractions/bus/org.freedesktop.portal.Desktop>
+  include <abstractions/bus/org.freedesktop.timedate1>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/gnome/gnome-characters b/apparmor.d/groups/gnome/gnome-characters
index 2ed2ba2bb..3231ce4b2 100644
--- a/apparmor.d/groups/gnome/gnome-characters
+++ b/apparmor.d/groups/gnome/gnome-characters
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = /usr/share/org.gnome.Characters/org.gnome.Characters
 profile gnome-characters @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/desktop>
+  include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/gnome/gnome-control-center b/apparmor.d/groups/gnome/gnome-control-center
index e18baa233..d261f4543 100644
--- a/apparmor.d/groups/gnome/gnome-control-center
+++ b/apparmor.d/groups/gnome/gnome-control-center
@@ -10,7 +10,7 @@ include <tunables/global>
 profile gnome-control-center @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/bus/atspi>
+  include <abstractions/bus/org.a11y>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session>
   include <abstractions/dbus>
diff --git a/apparmor.d/groups/gnome/gnome-control-center-goa-helper b/apparmor.d/groups/gnome/gnome-control-center-goa-helper
index 95260b334..83866fefc 100644
--- a/apparmor.d/groups/gnome/gnome-control-center-goa-helper
+++ b/apparmor.d/groups/gnome/gnome-control-center-goa-helper
@@ -9,8 +9,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/gnome-control-center-goa-helper
 profile gnome-control-center-goa-helper @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/avahi>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.Avahi>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/gnome/gnome-control-center-print-renderer b/apparmor.d/groups/gnome/gnome-control-center-print-renderer
index 359212a48..ff3bad828 100644
--- a/apparmor.d/groups/gnome/gnome-control-center-print-renderer
+++ b/apparmor.d/groups/gnome/gnome-control-center-print-renderer
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/gnome-control-center-print-renderer
 profile gnome-control-center-print-renderer @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
+  include <abstractions/bus/org.a11y>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/gnome/gnome-extension-ding b/apparmor.d/groups/gnome/gnome-extension-ding
index 35616d40a..fd9560948 100644
--- a/apparmor.d/groups/gnome/gnome-extension-ding
+++ b/apparmor.d/groups/gnome/gnome-extension-ding
@@ -9,11 +9,13 @@ include <tunables/global>
 @{exec_path} = /usr/share/gnome-shell/extensions/ding@rastersoft.com/{,app/}ding.js
 profile gnome-extension-ding @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/notification>
-  include <abstractions/bus/vfs/daemon>
-  include <abstractions/bus/vfs/metadata>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/net.hadess.SwitcherooControl>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.FileManager1>
+  include <abstractions/bus/org.freedesktop.Notifications>
+  include <abstractions/bus/org.gtk.vfs.Daemon>
+  include <abstractions/bus/org.gtk.vfs.Metadata>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/groups/gnome/gnome-keyring-daemon b/apparmor.d/groups/gnome/gnome-keyring-daemon
index 9ce06a22a..981a30f6e 100644
--- a/apparmor.d/groups/gnome/gnome-keyring-daemon
+++ b/apparmor.d/groups/gnome/gnome-keyring-daemon
@@ -10,9 +10,9 @@ include <tunables/global>
 @{exec_path} = @{bin}/gnome-keyring-daemon
 profile gnome-keyring-daemon @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/desktop>
-  include <abstractions/bus/login-session>
-  include <abstractions/bus/session-manager>
+  include <abstractions/bus/org.freedesktop.login1.Session>
+  include <abstractions/bus/org.freedesktop.portal.Desktop>
+  include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/openssl>
diff --git a/apparmor.d/groups/gnome/gnome-session-binary b/apparmor.d/groups/gnome/gnome-session-binary
index a9384534e..b1ed21a4e 100644
--- a/apparmor.d/groups/gnome/gnome-session-binary
+++ b/apparmor.d/groups/gnome/gnome-session-binary
@@ -9,11 +9,11 @@ include <tunables/global>
 @{exec_path} = @{lib}/gnome-session-binary
 profile gnome-session-binary @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/gnome-screensaver>
-  include <abstractions/bus/login-session>
-  include <abstractions/bus/login>
-  include <abstractions/bus/systemd-session>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.login1.Session>
+  include <abstractions/bus/org.freedesktop.login1>
+  include <abstractions/bus/org.freedesktop.systemd1-session>
+  include <abstractions/bus/org.gnome.ScreenSaver>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/groups/gnome/gnome-shell b/apparmor.d/groups/gnome/gnome-shell
index b510acc44..52e9ecc69 100644
--- a/apparmor.d/groups/gnome/gnome-shell
+++ b/apparmor.d/groups/gnome/gnome-shell
@@ -11,16 +11,30 @@ profile gnome-shell @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/app-launcher-user>
   include <abstractions/audio>
-  include <abstractions/bus/account-daemon>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/desktop>
-  include <abstractions/bus/gnome-screensaver>
-  include <abstractions/bus/network-manager>
-  include <abstractions/bus/polkit>
-  include <abstractions/bus/session-manager>
-  include <abstractions/bus/upower>
-  include <abstractions/bus/vfs/metadata>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/net.hadess.PowerProfiles>
+  include <abstractions/bus/net.hadess.SwitcherooControl>
+  include <abstractions/bus/net.reactivated.Fprint>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.Accounts>
+  include <abstractions/bus/org.freedesktop.ColorManager>
+  include <abstractions/bus/org.freedesktop.FileManager1>
+  include <abstractions/bus/org.freedesktop.GeoClue2>
+  include <abstractions/bus/org.freedesktop.impl.portal.PermissionStore>
+  include <abstractions/bus/org.freedesktop.locale1>
+  include <abstractions/bus/org.freedesktop.login1.Session>
+  include <abstractions/bus/org.freedesktop.login1>
+  include <abstractions/bus/org.freedesktop.NetworkManager>
+  include <abstractions/bus/org.freedesktop.PackageKit>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
+  include <abstractions/bus/org.freedesktop.portal.Desktop>
+  include <abstractions/bus/org.freedesktop.RealtimeKit1>
+  include <abstractions/bus/org.freedesktop.secrets>
+  include <abstractions/bus/org.freedesktop.systemd1>
+  include <abstractions/bus/org.freedesktop.UPower>
+  include <abstractions/bus/org.gnome.SessionManager>
+  include <abstractions/bus/org.gtk.vfs.Daemon>
+  include <abstractions/bus/org.gtk.vfs.Metadata>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/groups/gnome/gnome-terminal-server b/apparmor.d/groups/gnome/gnome-terminal-server
index ee7f94101..6b5595b62 100644
--- a/apparmor.d/groups/gnome/gnome-terminal-server
+++ b/apparmor.d/groups/gnome/gnome-terminal-server
@@ -9,9 +9,9 @@ include <tunables/global>
 @{exec_path} = @{lib}/gnome-terminal-server
 profile gnome-terminal-server @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/desktop>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.portal.Desktop>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/consoles>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
diff --git a/apparmor.d/groups/gnome/goa-daemon b/apparmor.d/groups/gnome/goa-daemon
index f0d966c1d..d9a7aeb54 100644
--- a/apparmor.d/groups/gnome/goa-daemon
+++ b/apparmor.d/groups/gnome/goa-daemon
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/goa-daemon
 profile goa-daemon @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/network-manager>
+  include <abstractions/bus/org.freedesktop.NetworkManager>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/gnome/gsd-a11y-settings b/apparmor.d/groups/gnome/gsd-a11y-settings
index 5e9d2a6bc..7ceb20d34 100644
--- a/apparmor.d/groups/gnome/gsd-a11y-settings
+++ b/apparmor.d/groups/gnome/gsd-a11y-settings
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/gsd-a11y-settings
 profile gsd-a11y-settings @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/session-manager>
+  include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
 
diff --git a/apparmor.d/groups/gnome/gsd-color b/apparmor.d/groups/gnome/gsd-color
index 03ad49b01..54a06e324 100644
--- a/apparmor.d/groups/gnome/gsd-color
+++ b/apparmor.d/groups/gnome/gsd-color
@@ -9,9 +9,11 @@ include <tunables/global>
 @{exec_path} = @{lib}/gsd-color
 profile gsd-color @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/session-manager>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.ColorManager>
+  include <abstractions/bus/org.gnome.Mutter.DisplayConfig>
+  include <abstractions/bus/org.gnome.SessionManager>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/groups/gnome/gsd-datetime b/apparmor.d/groups/gnome/gsd-datetime
index e31d00328..52f43ad43 100644
--- a/apparmor.d/groups/gnome/gsd-datetime
+++ b/apparmor.d/groups/gnome/gsd-datetime
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/gsd-datetime
 profile gsd-datetime @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/session-manager>
+  include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
 
diff --git a/apparmor.d/groups/gnome/gsd-disk-utility-notify b/apparmor.d/groups/gnome/gsd-disk-utility-notify
index 02a147b35..0f8577695 100644
--- a/apparmor.d/groups/gnome/gsd-disk-utility-notify
+++ b/apparmor.d/groups/gnome/gsd-disk-utility-notify
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/gsd-disk-utility-notify
 profile gsd-disk-utility-notify @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/udisk>
+  include <abstractions/bus/org.freedesktop.UDisks2>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
 
diff --git a/apparmor.d/groups/gnome/gsd-housekeeping b/apparmor.d/groups/gnome/gsd-housekeeping
index cb9c9762b..9716b8d21 100644
--- a/apparmor.d/groups/gnome/gsd-housekeeping
+++ b/apparmor.d/groups/gnome/gsd-housekeeping
@@ -10,8 +10,8 @@ include <tunables/global>
 profile gsd-housekeeping @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/app-launcher-user>
-  include <abstractions/bus/session-manager>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.gnome.SessionManager>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
   include <abstractions/thumbnails-cache-read>
diff --git a/apparmor.d/groups/gnome/gsd-keyboard b/apparmor.d/groups/gnome/gsd-keyboard
index c354e49c0..60879460d 100644
--- a/apparmor.d/groups/gnome/gsd-keyboard
+++ b/apparmor.d/groups/gnome/gsd-keyboard
@@ -9,10 +9,10 @@ include <tunables/global>
 @{exec_path} = @{lib}/gsd-keyboard
 profile gsd-keyboard @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/locale>
-  include <abstractions/bus/session-manager>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.locale1>
+  include <abstractions/bus/org.gnome.SessionManager>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/groups/gnome/gsd-media-keys b/apparmor.d/groups/gnome/gsd-media-keys
index 66c86cf7d..39d5e40a0 100644
--- a/apparmor.d/groups/gnome/gsd-media-keys
+++ b/apparmor.d/groups/gnome/gsd-media-keys
@@ -10,11 +10,11 @@ include <tunables/global>
 profile gsd-media-keys @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/hostname>
-  include <abstractions/bus/login>
-  include <abstractions/bus/session-manager>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.hostname1>
+  include <abstractions/bus/org.freedesktop.login1>
+  include <abstractions/bus/org.gnome.SessionManager>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/groups/gnome/gsd-power b/apparmor.d/groups/gnome/gsd-power
index 198137271..70959f731 100644
--- a/apparmor.d/groups/gnome/gsd-power
+++ b/apparmor.d/groups/gnome/gsd-power
@@ -10,13 +10,15 @@ include <tunables/global>
 profile gsd-power @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/gnome-screensaver>
-  include <abstractions/bus/login-session>
-  include <abstractions/bus/login>
-  include <abstractions/bus/session-manager>
-  include <abstractions/bus/upower>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/net.hadess.PowerProfiles>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.login1.Session>
+  include <abstractions/bus/org.freedesktop.login1>
+  include <abstractions/bus/org.freedesktop.UPower>
+  include <abstractions/bus/org.gnome.Mutter.DisplayConfig>
+  include <abstractions/bus/org.gnome.ScreenSaver>
+  include <abstractions/bus/org.gnome.SessionManager>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/groups/gnome/gsd-print-notifications b/apparmor.d/groups/gnome/gsd-print-notifications
index 40084c31c..158afae62 100644
--- a/apparmor.d/groups/gnome/gsd-print-notifications
+++ b/apparmor.d/groups/gnome/gsd-print-notifications
@@ -9,8 +9,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/gsd-print-notifications
 profile gsd-print-notifications @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/avahi>
-  include <abstractions/bus/session-manager>
+  include <abstractions/bus/org.freedesktop.Avahi>
+  include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/gnome/gsd-printer b/apparmor.d/groups/gnome/gsd-printer
index fdb4b30d7..37c571ce3 100644
--- a/apparmor.d/groups/gnome/gsd-printer
+++ b/apparmor.d/groups/gnome/gsd-printer
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/gsd-printer
 profile gsd-printer @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/session-manager>
+  include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/gnome/gsd-rfkill b/apparmor.d/groups/gnome/gsd-rfkill
index 620e63c80..8ba57fa23 100644
--- a/apparmor.d/groups/gnome/gsd-rfkill
+++ b/apparmor.d/groups/gnome/gsd-rfkill
@@ -9,10 +9,10 @@ include <tunables/global>
 @{exec_path} = @{lib}/gsd-rfkill
 profile gsd-rfkill @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/hostname>
-  include <abstractions/bus/modem-manager>
-  include <abstractions/bus/network-manager>
-  include <abstractions/bus/session-manager>
+  include <abstractions/bus/org.freedesktop.hostname1>
+  include <abstractions/bus/org.freedesktop.ModemManager1>
+  include <abstractions/bus/org.freedesktop.NetworkManager>
+  include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
 
diff --git a/apparmor.d/groups/gnome/gsd-screensaver-proxy b/apparmor.d/groups/gnome/gsd-screensaver-proxy
index 1ff0336ec..43efda14b 100644
--- a/apparmor.d/groups/gnome/gsd-screensaver-proxy
+++ b/apparmor.d/groups/gnome/gsd-screensaver-proxy
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/gsd-screensaver-proxy
 profile gsd-screensaver-proxy @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/session-manager>
+  include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/dbus-session-strict>
 
   signal (receive) set=(term, hup) peer=gdm*,
diff --git a/apparmor.d/groups/gnome/gsd-sharing b/apparmor.d/groups/gnome/gsd-sharing
index 30cb0b4b3..55bff5886 100644
--- a/apparmor.d/groups/gnome/gsd-sharing
+++ b/apparmor.d/groups/gnome/gsd-sharing
@@ -9,8 +9,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/gsd-sharing
 profile gsd-sharing @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/session-manager>
-  include <abstractions/bus/network-manager>
+  include <abstractions/bus/org.freedesktop.NetworkManager>
+  include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/gnome/gsd-smartcard b/apparmor.d/groups/gnome/gsd-smartcard
index a1cb61150..7617ff331 100644
--- a/apparmor.d/groups/gnome/gsd-smartcard
+++ b/apparmor.d/groups/gnome/gsd-smartcard
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/gsd-smartcard
 profile gsd-smartcard @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/session-manager>
+  include <abstractions/bus/org.gnome.SessionManager>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/gnome/gsd-sound b/apparmor.d/groups/gnome/gsd-sound
index 52ceebfe9..de8ef6223 100644
--- a/apparmor.d/groups/gnome/gsd-sound
+++ b/apparmor.d/groups/gnome/gsd-sound
@@ -10,8 +10,8 @@ include <tunables/global>
 profile gsd-sound @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/bus/session-manager>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.gnome.SessionManager>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
 
diff --git a/apparmor.d/groups/gnome/gsd-wacom b/apparmor.d/groups/gnome/gsd-wacom
index c2b915140..9d5c2681d 100644
--- a/apparmor.d/groups/gnome/gsd-wacom
+++ b/apparmor.d/groups/gnome/gsd-wacom
@@ -9,9 +9,9 @@ include <tunables/global>
 @{exec_path} = @{lib}/gsd-wacom
 profile gsd-wacom @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/session-manager>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.gnome.SessionManager>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/gnome/gsd-xsettings b/apparmor.d/groups/gnome/gsd-xsettings
index 8f1d67703..1f996061a 100644
--- a/apparmor.d/groups/gnome/gsd-xsettings
+++ b/apparmor.d/groups/gnome/gsd-xsettings
@@ -9,10 +9,11 @@ include <tunables/global>
 @{exec_path} = @{lib}/gsd-xsettings
 profile gsd-xsettings @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/account-daemon>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/session-manager>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.Accounts>
+  include <abstractions/bus/org.gnome.Mutter.DisplayConfig>
+  include <abstractions/bus/org.gnome.SessionManager>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/groups/gnome/nautilus b/apparmor.d/groups/gnome/nautilus
index 33b0699cc..5bbc93974 100644
--- a/apparmor.d/groups/gnome/nautilus
+++ b/apparmor.d/groups/gnome/nautilus
@@ -9,9 +9,9 @@ include <tunables/global>
 @{exec_path} = @{bin}/nautilus
 profile nautilus @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/desktop>
-  include <abstractions/bus/hostname>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.hostname1>
+  include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/groups/gnome/seahorse b/apparmor.d/groups/gnome/seahorse
index 04ad0605a..0160d5925 100644
--- a/apparmor.d/groups/gnome/seahorse
+++ b/apparmor.d/groups/gnome/seahorse
@@ -9,8 +9,10 @@ include <tunables/global>
 @{exec_path} = @{bin}/seahorse
 profile seahorse @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/avahi>
-  include <abstractions/bus/desktop>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.Avahi>
+  include <abstractions/bus/org.freedesktop.portal.Desktop>
+  include <abstractions/bus/org.freedesktop.secrets>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/gnome/tracker-extract b/apparmor.d/groups/gnome/tracker-extract
index e6b436d68..ce64f017d 100644
--- a/apparmor.d/groups/gnome/tracker-extract
+++ b/apparmor.d/groups/gnome/tracker-extract
@@ -9,8 +9,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/tracker-extract-3
 profile tracker-extract @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/vfs/daemon>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.gtk.vfs.Daemon>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
   include <abstractions/deny-sensitive-home>
diff --git a/apparmor.d/groups/gvfs/gvfs-udisks2-volume-monitor b/apparmor.d/groups/gvfs/gvfs-udisks2-volume-monitor
index 2bcf2fc68..a92f4a48d 100644
--- a/apparmor.d/groups/gvfs/gvfs-udisks2-volume-monitor
+++ b/apparmor.d/groups/gvfs/gvfs-udisks2-volume-monitor
@@ -10,8 +10,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,gvfs/}gvfs-udisks2-volume-monitor
 profile gvfs-udisks2-volume-monitor @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/udisk>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.freedesktop.UDisks2>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/gvfs/gvfsd-dnssd b/apparmor.d/groups/gvfs/gvfsd-dnssd
index 20f21e322..c081b6bd5 100644
--- a/apparmor.d/groups/gvfs/gvfsd-dnssd
+++ b/apparmor.d/groups/gvfs/gvfsd-dnssd
@@ -10,8 +10,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,gvfs/}gvfsd-dnssd
 profile gvfsd-dnssd @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/avahi>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.freedesktop.Avahi>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
 
diff --git a/apparmor.d/groups/gvfs/gvfsd-fuse b/apparmor.d/groups/gvfs/gvfsd-fuse
index 9d5174a3a..7fe5c1e39 100644
--- a/apparmor.d/groups/gvfs/gvfsd-fuse
+++ b/apparmor.d/groups/gvfs/gvfsd-fuse
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,gvfs/}gvfsd-fuse
 profile gvfsd-fuse @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-session-strict>
 
   unix (send,receive) type=stream addr=none peer=(label=gvfsd-fuse//fusermount),
diff --git a/apparmor.d/groups/gvfs/gvfsd-smb-browse b/apparmor.d/groups/gvfs/gvfsd-smb-browse
index 7836b81ca..5f1f91bba 100644
--- a/apparmor.d/groups/gvfs/gvfsd-smb-browse
+++ b/apparmor.d/groups/gvfs/gvfsd-smb-browse
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,gvfs/}gvfsd-smb-browse
 profile gvfsd-smb-browse @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/groups/kde/kded5 b/apparmor.d/groups/kde/kded5
index 6162f7bd7..2c89d4bb1 100644
--- a/apparmor.d/groups/kde/kded5
+++ b/apparmor.d/groups/kde/kded5
@@ -10,7 +10,7 @@ include <tunables/global>
 profile kded5 @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/bus/bluetooth>
+  include <abstractions/bus/org.bluez>
   include <abstractions/consoles>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/kde/plasmashell b/apparmor.d/groups/kde/plasmashell
index 0e35a8458..923e63e47 100644
--- a/apparmor.d/groups/kde/plasmashell
+++ b/apparmor.d/groups/kde/plasmashell
@@ -11,7 +11,7 @@ profile plasmashell @{exec_path} flags=(mediate_deleted) {
   include <abstractions/base>
   include <abstractions/app-launcher-user>
   include <abstractions/audio>
-  include <abstractions/bus/upower>
+  include <abstractions/bus/org.freedesktop.UPower>
   include <abstractions/consoles>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/groups/network/ModemManager b/apparmor.d/groups/network/ModemManager
index 806e3cc81..ca04cd06c 100644
--- a/apparmor.d/groups/network/ModemManager
+++ b/apparmor.d/groups/network/ModemManager
@@ -9,8 +9,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/ModemManager
 profile ModemManager @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/polkit>
-  include <abstractions/bus/login>
+  include <abstractions/bus/org.freedesktop.login1>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/consoles>
   include <abstractions/dbus-strict>
   include <abstractions/devices-usb>
diff --git a/apparmor.d/groups/network/NetworkManager b/apparmor.d/groups/network/NetworkManager
index a1ea93288..06da8c253 100644
--- a/apparmor.d/groups/network/NetworkManager
+++ b/apparmor.d/groups/network/NetworkManager
@@ -9,14 +9,13 @@ include <tunables/global>
 @{exec_path} = @{bin}/NetworkManager
 profile NetworkManager @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/bluetooth>
-  include <abstractions/bus/hostname>
-  include <abstractions/bus/login>
-  include <abstractions/bus/modem-manager>
-  include <abstractions/bus/network-manager>
-  include <abstractions/bus/polkit>
-  include <abstractions/bus/wpa-supplicant>
-  include <abstractions/dbus-strict>
+  include <abstractions/bus/fi.w1.wpa_supplicant1>
+  include <abstractions/bus/org.bluez>
+  include <abstractions/bus/org.freedesktop.hostname1>
+  include <abstractions/bus/org.freedesktop.login1>
+  include <abstractions/bus/org.freedesktop.ModemManager1>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
+  include <abstractions/bus/system>
   include <abstractions/nameservice-strict>
   include <abstractions/openssl>
   include <abstractions/ssl_certs>
diff --git a/apparmor.d/groups/systemd/hostnamectl b/apparmor.d/groups/systemd/hostnamectl
index fcac8ed0f..58d967d62 100644
--- a/apparmor.d/groups/systemd/hostnamectl
+++ b/apparmor.d/groups/systemd/hostnamectl
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/hostnamectl
 profile hostnamectl @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/hostname>
+  include <abstractions/bus/org.freedesktop.hostname1>
   include <abstractions/consoles>
   include <abstractions/dbus-strict>
 
diff --git a/apparmor.d/groups/systemd/loginctl b/apparmor.d/groups/systemd/loginctl
index 520897b19..4a8139431 100644
--- a/apparmor.d/groups/systemd/loginctl
+++ b/apparmor.d/groups/systemd/loginctl
@@ -9,8 +9,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/loginctl
 profile loginctl @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/login-session>
-  include <abstractions/bus/login>
+  include <abstractions/bus/org.freedesktop.login1.Session>
+  include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/dbus-strict>
   include <abstractions/systemd-common>
 
diff --git a/apparmor.d/groups/systemd/systemd-hostnamed b/apparmor.d/groups/systemd/systemd-hostnamed
index d1c6bb89e..f3bdb1e62 100644
--- a/apparmor.d/groups/systemd/systemd-hostnamed
+++ b/apparmor.d/groups/systemd/systemd-hostnamed
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/systemd/systemd-hostnamed
 profile systemd-hostnamed @{exec_path}  flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/dbus-strict>
   include <abstractions/systemd-common>
 
diff --git a/apparmor.d/groups/systemd/systemd-logind b/apparmor.d/groups/systemd/systemd-logind
index 8a2ddef6a..737ae9cda 100644
--- a/apparmor.d/groups/systemd/systemd-logind
+++ b/apparmor.d/groups/systemd/systemd-logind
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/systemd/systemd-logind
 profile systemd-logind @{exec_path} flags=(attach_disconnected,complain) {
   include <abstractions/base>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/consoles>
   include <abstractions/dbus-strict>
   include <abstractions/devices-usb>
diff --git a/apparmor.d/groups/systemd/systemd-networkd b/apparmor.d/groups/systemd/systemd-networkd
index f8b7ed772..b1b92df5c 100644
--- a/apparmor.d/groups/systemd/systemd-networkd
+++ b/apparmor.d/groups/systemd/systemd-networkd
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/systemd/systemd-networkd
 profile systemd-networkd @{exec_path} flags=(attach_disconnected,complain) {
   include <abstractions/base>
-  include <abstractions/bus/hostname>
+  include <abstractions/bus/org.freedesktop.hostname1>
   include <abstractions/dbus-strict>
   include <abstractions/systemd-common>
 
diff --git a/apparmor.d/groups/systemd/systemd-resolved b/apparmor.d/groups/systemd/systemd-resolved
index ba2888791..f938b7e32 100644
--- a/apparmor.d/groups/systemd/systemd-resolved
+++ b/apparmor.d/groups/systemd/systemd-resolved
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/systemd/systemd-resolved
 profile systemd-resolved @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/login>
+  include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
   include <abstractions/openssl>
diff --git a/apparmor.d/groups/systemd/systemd-user-runtime-dir b/apparmor.d/groups/systemd/systemd-user-runtime-dir
index eddb8276c..71a0f6655 100644
--- a/apparmor.d/groups/systemd/systemd-user-runtime-dir
+++ b/apparmor.d/groups/systemd/systemd-user-runtime-dir
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/systemd/systemd-user-runtime-dir
 profile systemd-user-runtime-dir @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/login>
+  include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
   include <abstractions/systemd-common>
diff --git a/apparmor.d/groups/ubuntu/check-new-release-gtk b/apparmor.d/groups/ubuntu/check-new-release-gtk
index d681b458d..5bb04cc44 100644
--- a/apparmor.d/groups/ubuntu/check-new-release-gtk
+++ b/apparmor.d/groups/ubuntu/check-new-release-gtk
@@ -10,7 +10,7 @@ include <tunables/global>
 profile check-new-release-gtk @{exec_path} {
   include <abstractions/base>
   include <abstractions/apt-common>
-  include <abstractions/bus/atspi>
+  include <abstractions/bus/org.a11y>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/ubuntu/software-properties-gtk b/apparmor.d/groups/ubuntu/software-properties-gtk
index a6a792f41..0bb3bc525 100644
--- a/apparmor.d/groups/ubuntu/software-properties-gtk
+++ b/apparmor.d/groups/ubuntu/software-properties-gtk
@@ -10,6 +10,8 @@ include <tunables/global>
 profile software-properties-gtk @{exec_path} {
   include <abstractions/base>
   include <abstractions/apt-common>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/ubuntu/ubuntu-advantage-notification b/apparmor.d/groups/ubuntu/ubuntu-advantage-notification
index 8f7e5b153..a5838563e 100644
--- a/apparmor.d/groups/ubuntu/ubuntu-advantage-notification
+++ b/apparmor.d/groups/ubuntu/ubuntu-advantage-notification
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/update-notifier/ubuntu-advantage-notification
 profile ubuntu-advantage-notification @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
+  include <abstractions/bus/org.a11y>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/groups/ubuntu/update-manager b/apparmor.d/groups/ubuntu/update-manager
index 4bb84a705..6a849761e 100644
--- a/apparmor.d/groups/ubuntu/update-manager
+++ b/apparmor.d/groups/ubuntu/update-manager
@@ -10,9 +10,9 @@ include <tunables/global>
 profile update-manager @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/apt-common>
-  include <abstractions/bus/login>
-  include <abstractions/bus/network-manager>
-  include <abstractions/bus/upower>
+  include <abstractions/bus/org.freedesktop.login1>
+  include <abstractions/bus/org.freedesktop.NetworkManager>
+  include <abstractions/bus/org.freedesktop.UPower>
   include <abstractions/consoles>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/groups/ubuntu/update-notifier b/apparmor.d/groups/ubuntu/update-notifier
index dd78040e5..6b25889e2 100644
--- a/apparmor.d/groups/ubuntu/update-notifier
+++ b/apparmor.d/groups/ubuntu/update-notifier
@@ -11,7 +11,7 @@ profile update-notifier @{exec_path} {
   include <abstractions/base>
   include <abstractions/apt-common>
   include <abstractions/audio>
-  include <abstractions/bus/atspi>
+  include <abstractions/bus/org.a11y>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/profiles-a-f/atril b/apparmor.d/profiles-a-f/atril
index 0e5eae47d..30c45d71d 100644
--- a/apparmor.d/profiles-a-f/atril
+++ b/apparmor.d/profiles-a-f/atril
@@ -10,8 +10,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/atril{,-*}
 profile atril @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/profiles-a-f/boltd b/apparmor.d/profiles-a-f/boltd
index d0d162a9e..2c503d360 100644
--- a/apparmor.d/profiles-a-f/boltd
+++ b/apparmor.d/profiles-a-f/boltd
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/boltd
 profile boltd @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
 
diff --git a/apparmor.d/profiles-a-f/cups-backend-dnssd b/apparmor.d/profiles-a-f/cups-backend-dnssd
index dea4763f4..faf27b706 100644
--- a/apparmor.d/profiles-a-f/cups-backend-dnssd
+++ b/apparmor.d/profiles-a-f/cups-backend-dnssd
@@ -9,6 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/cups/backend/dnssd
 profile cups-backend-dnssd @{exec_path} {
   include <abstractions/base>
+  include <abstractions/bus/org.freedesktop.Avahi>
 
   @{exec_path} mr,
 
diff --git a/apparmor.d/profiles-a-f/cups-browsed b/apparmor.d/profiles-a-f/cups-browsed
index fa4cda6fd..f643ad0e9 100644
--- a/apparmor.d/profiles-a-f/cups-browsed
+++ b/apparmor.d/profiles-a-f/cups-browsed
@@ -9,6 +9,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/cups-browsed
 profile cups-browsed @{exec_path} {
   include <abstractions/base>
+  include <abstractions/bus/org.freedesktop.Avahi>
+  include <abstractions/bus/org.freedesktop.NetworkManager>
   include <abstractions/cups-client>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/profiles-a-f/cups-pk-helper-mechanism b/apparmor.d/profiles-a-f/cups-pk-helper-mechanism
index dff453b6b..90721065b 100644
--- a/apparmor.d/profiles-a-f/cups-pk-helper-mechanism
+++ b/apparmor.d/profiles-a-f/cups-pk-helper-mechanism
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} += @{lib}/@{multiarch}/cups-pk-helper-mechanism
 profile cups-pk-helper-mechanism @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
 
diff --git a/apparmor.d/profiles-a-f/cupsd b/apparmor.d/profiles-a-f/cupsd
index 4c8021d5e..84921ece6 100644
--- a/apparmor.d/profiles-a-f/cupsd
+++ b/apparmor.d/profiles-a-f/cupsd
@@ -8,7 +8,8 @@ include <tunables/global>
 profile cupsd @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/authentication>
-  include <abstractions/dbus-strict>
+  include <abstractions/bus/org.freedesktop.Avahi>
+  include <abstractions/bus/system>
   include <abstractions/nameservice-strict>
   include <abstractions/openssl>
   include <abstractions/python>
diff --git a/apparmor.d/profiles-a-f/engrampa b/apparmor.d/profiles-a-f/engrampa
index 37303d3e8..7b440ee6b 100644
--- a/apparmor.d/profiles-a-f/engrampa
+++ b/apparmor.d/profiles-a-f/engrampa
@@ -10,8 +10,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/engrampa
 profile engrampa @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/vfs/mount>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.gtk.vfs.MountTracker>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/profiles-a-f/evince b/apparmor.d/profiles-a-f/evince
index e71e6fa68..a2da1e9a8 100644
--- a/apparmor.d/profiles-a-f/evince
+++ b/apparmor.d/profiles-a-f/evince
@@ -9,8 +9,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/evince @{lib}/evinced
 profile evince @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/desktop>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.portal.Desktop>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/profiles-a-f/fprintd b/apparmor.d/profiles-a-f/fprintd
index 8e19b1e42..705cac998 100644
--- a/apparmor.d/profiles-a-f/fprintd
+++ b/apparmor.d/profiles-a-f/fprintd
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/fprintd
 profile fprintd @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/login>
+  include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/dbus-strict>
   include <abstractions/devices-usb>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/profiles-a-f/fwupd b/apparmor.d/profiles-a-f/fwupd
index ef21b2eab..dc23df362 100644
--- a/apparmor.d/profiles-a-f/fwupd
+++ b/apparmor.d/profiles-a-f/fwupd
@@ -10,10 +10,10 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,fwupd/}fwupd
 profile fwupd @{exec_path} flags=(complain,attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/modem-manager>
-  include <abstractions/bus/polkit>
-  include <abstractions/bus/udisk>
-  include <abstractions/bus/upower>
+  include <abstractions/bus/org.freedesktop.ModemManager1>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
+  include <abstractions/bus/org.freedesktop.UDisks2>
+  include <abstractions/bus/org.freedesktop.UPower>
   include <abstractions/consoles>
   include <abstractions/dbus-strict>
   include <abstractions/disks-read>
diff --git a/apparmor.d/profiles-g-l/login b/apparmor.d/profiles-g-l/login
index 554cb6f45..c8211e64d 100644
--- a/apparmor.d/profiles-g-l/login
+++ b/apparmor.d/profiles-g-l/login
@@ -10,7 +10,7 @@ include <tunables/global>
 profile login @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/authentication>
-  include <abstractions/bus/login>
+  include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/consoles>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/profiles-m-r/murmurd b/apparmor.d/profiles-m-r/murmurd
index 82bcafa78..47faeb87f 100644
--- a/apparmor.d/profiles-m-r/murmurd
+++ b/apparmor.d/profiles-m-r/murmurd
@@ -7,7 +7,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/murmurd
 profile murmurd @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/avahi>
+  include <abstractions/bus/org.freedesktop.Avahi>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
   include <abstractions/openssl>
diff --git a/apparmor.d/profiles-m-r/needrestart-apt-pinvoke b/apparmor.d/profiles-m-r/needrestart-apt-pinvoke
index 35b26db40..45408b1f1 100644
--- a/apparmor.d/profiles-m-r/needrestart-apt-pinvoke
+++ b/apparmor.d/profiles-m-r/needrestart-apt-pinvoke
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/needrestart/apt-pinvoke
 profile needrestart-apt-pinvoke @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/login>
+  include <abstractions/bus/org.freedesktop.login1>
   include <abstractions/consoles>
   include <abstractions/dbus-strict>
 
diff --git a/apparmor.d/profiles-m-r/packagekitd b/apparmor.d/profiles-m-r/packagekitd
index 2ca977fba..36970e581 100644
--- a/apparmor.d/profiles-m-r/packagekitd
+++ b/apparmor.d/profiles-m-r/packagekitd
@@ -9,8 +9,9 @@ include <tunables/global>
 @{exec_path} = @{lib}/packagekitd
 profile packagekitd @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/login>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.login1>
+  include <abstractions/bus/org.freedesktop.NetworkManager>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
   include <abstractions/openssl>
diff --git a/apparmor.d/profiles-m-r/pkexec b/apparmor.d/profiles-m-r/pkexec
index 0e9939ae5..4d22bf163 100644
--- a/apparmor.d/profiles-m-r/pkexec
+++ b/apparmor.d/profiles-m-r/pkexec
@@ -11,7 +11,7 @@ include <tunables/global>
 profile pkexec @{exec_path} {
   include <abstractions/base>
   include <abstractions/authentication>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/consoles>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/profiles-m-r/pkttyagent b/apparmor.d/profiles-m-r/pkttyagent
index 37afb41d4..6a18743a1 100644
--- a/apparmor.d/profiles-m-r/pkttyagent
+++ b/apparmor.d/profiles-m-r/pkttyagent
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/pkttyagent
 profile pkttyagent @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/consoles>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/profiles-m-r/power-profiles-daemon b/apparmor.d/profiles-m-r/power-profiles-daemon
index 00b1489bd..ddf177c35 100644
--- a/apparmor.d/profiles-m-r/power-profiles-daemon
+++ b/apparmor.d/profiles-m-r/power-profiles-daemon
@@ -9,8 +9,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/power-profiles-daemon
 profile power-profiles-daemon @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/login>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.login1>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
 
diff --git a/apparmor.d/profiles-m-r/qbittorrent b/apparmor.d/profiles-m-r/qbittorrent
index 1d3c1fc6b..ff36c6757 100644
--- a/apparmor.d/profiles-m-r/qbittorrent
+++ b/apparmor.d/profiles-m-r/qbittorrent
@@ -13,7 +13,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/qbittorrent
 profile qbittorrent @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
+  include <abstractions/bus/org.a11y>
   include <abstractions/consoles>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
diff --git a/apparmor.d/profiles-m-r/remmina b/apparmor.d/profiles-m-r/remmina
index 241c2a0a2..ae3a11c83 100644
--- a/apparmor.d/profiles-m-r/remmina
+++ b/apparmor.d/profiles-m-r/remmina
@@ -9,8 +9,9 @@ include <tunables/global>
 @{exec_path} = @{bin}/remmina
 profile remmina @{exec_path} {
   include <abstractions/base>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/hostname>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.hostname1>
+  include <abstractions/bus/org.freedesktop.secrets>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/profiles-m-r/rtkit-daemon b/apparmor.d/profiles-m-r/rtkit-daemon
index afc1642c5..ed388a905 100644
--- a/apparmor.d/profiles-m-r/rtkit-daemon
+++ b/apparmor.d/profiles-m-r/rtkit-daemon
@@ -10,7 +10,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,rtkit/}rtkit-daemon
 profile rtkit-daemon @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>
 
diff --git a/apparmor.d/profiles-m-r/rustdesk b/apparmor.d/profiles-m-r/rustdesk
index da2e5e249..ce21aef04 100644
--- a/apparmor.d/profiles-m-r/rustdesk
+++ b/apparmor.d/profiles-m-r/rustdesk
@@ -9,7 +9,7 @@ include <tunables/global>
 profile rustdesk @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/bus/atspi>
+  include <abstractions/bus/org.a11y>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/fontconfig-cache-read>
diff --git a/apparmor.d/profiles-s-z/snapd b/apparmor.d/profiles-s-z/snapd
index dc3f4ce96..19ad28f39 100644
--- a/apparmor.d/profiles-s-z/snapd
+++ b/apparmor.d/profiles-s-z/snapd
@@ -13,7 +13,7 @@ include <tunables/global>
 profile snapd @{exec_path} {
   include <abstractions/base>
   include <abstractions/authentication>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/dbus-strict>
   include <abstractions/disks-write>
   include <abstractions/fontconfig-cache-write>
diff --git a/apparmor.d/profiles-s-z/spice-vdagent b/apparmor.d/profiles-s-z/spice-vdagent
index 3e9d69dcd..af964c642 100644
--- a/apparmor.d/profiles-s-z/spice-vdagent
+++ b/apparmor.d/profiles-s-z/spice-vdagent
@@ -10,9 +10,10 @@ include <tunables/global>
 profile spice-vdagent @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/desktop>
-  include <abstractions/bus/rtkit>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.portal.Desktop>
+  include <abstractions/bus/org.freedesktop.RealtimeKit1>
+  include <abstractions/bus/org.gnome.Mutter.DisplayConfig>
   include <abstractions/dbus-accessibility-strict>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
diff --git a/apparmor.d/profiles-s-z/spice-vdagentd b/apparmor.d/profiles-s-z/spice-vdagentd
index 1a0064fea..c42faeba7 100644
--- a/apparmor.d/profiles-s-z/spice-vdagentd
+++ b/apparmor.d/profiles-s-z/spice-vdagentd
@@ -10,7 +10,7 @@ include <tunables/global>
 profile spice-vdagentd @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/dbus-strict>
-  include <abstractions/bus/login-session>
+  include <abstractions/bus/org.freedesktop.login1.Session>
 
   capability sys_nice,
 
diff --git a/apparmor.d/profiles-s-z/system-config-printer b/apparmor.d/profiles-s-z/system-config-printer
index 88ae544e8..54db96e80 100644
--- a/apparmor.d/profiles-s-z/system-config-printer
+++ b/apparmor.d/profiles-s-z/system-config-printer
@@ -11,8 +11,8 @@ include <tunables/global>
 @{exec_path} += /usr/share/system-config-printer/system-config-printer.py
 profile system-config-printer @{exec_path} flags=(complain) {
   include <abstractions/base>
-  include <abstractions/bus/hostname>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.hostname1>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/profiles-s-z/thermald b/apparmor.d/profiles-s-z/thermald
index 14d76ad80..3d9e025a1 100644
--- a/apparmor.d/profiles-s-z/thermald
+++ b/apparmor.d/profiles-s-z/thermald
@@ -11,7 +11,8 @@ include <tunables/global>
 @{exec_path} = @{bin}/thermald
 profile thermald @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/upower>
+  include <abstractions/bus/net.hadess.PowerProfiles>
+  include <abstractions/bus/org.freedesktop.UPower>
   include <abstractions/dbus-strict>
 
   capability sys_boot,
diff --git a/apparmor.d/profiles-s-z/thunderbird b/apparmor.d/profiles-s-z/thunderbird
index c79a7648f..1b8c961e3 100644
--- a/apparmor.d/profiles-s-z/thunderbird
+++ b/apparmor.d/profiles-s-z/thunderbird
@@ -16,9 +16,9 @@ include <tunables/global>
 profile thunderbird @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/bus/atspi>
-  include <abstractions/bus/rtkit>
-  include <abstractions/bus/desktop>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.portal.Desktop>
+  include <abstractions/bus/org.freedesktop.RealtimeKit1>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/dconf-write>
diff --git a/apparmor.d/profiles-s-z/udisksd b/apparmor.d/profiles-s-z/udisksd
index 0c704f415..633526aae 100644
--- a/apparmor.d/profiles-s-z/udisksd
+++ b/apparmor.d/profiles-s-z/udisksd
@@ -10,8 +10,8 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,udisks2/}udisksd
 profile udisksd @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/bus/login>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.login1>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/dbus-strict>
   include <abstractions/disks-write>
   include <abstractions/nameservice-strict>
diff --git a/apparmor.d/profiles-s-z/vlc b/apparmor.d/profiles-s-z/vlc
index 5ddcf28f8..f943f0ebc 100644
--- a/apparmor.d/profiles-s-z/vlc
+++ b/apparmor.d/profiles-s-z/vlc
@@ -11,9 +11,10 @@ include <tunables/global>
 profile vlc @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/bus/atspi>
-  include <abstractions/dbus-accessibility-strict>
-  include <abstractions/dbus-session-strict>
+  include <abstractions/bus/accessibility>
+  include <abstractions/bus/org.a11y>
+  include <abstractions/bus/org.freedesktop.ScreenSaver>
+  include <abstractions/bus/session>
   include <abstractions/dconf-write>
   include <abstractions/devices-usb>
   include <abstractions/fontconfig-cache-read>
diff --git a/apparmor.d/profiles-s-z/wireplumber b/apparmor.d/profiles-s-z/wireplumber
index 3bd701a68..999a11a94 100644
--- a/apparmor.d/profiles-s-z/wireplumber
+++ b/apparmor.d/profiles-s-z/wireplumber
@@ -10,8 +10,8 @@ include <tunables/global>
 profile wireplumber @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/bus/rtkit>
-  include <abstractions/bus/upower>
+  include <abstractions/bus/org.freedesktop.RealtimeKit1>
+  include <abstractions/bus/org.freedesktop.UPower>
   include <abstractions/dbus-session-strict>
   include <abstractions/dbus-strict>
   include <abstractions/devices-usb>
diff --git a/apparmor.d/profiles-s-z/zsysd b/apparmor.d/profiles-s-z/zsysd
index 167de33ea..724622ba3 100644
--- a/apparmor.d/profiles-s-z/zsysd
+++ b/apparmor.d/profiles-s-z/zsysd
@@ -9,7 +9,7 @@ include <tunables/global>
 @{exec_path} = @{bin}/zsysd @{bin}/zsysctl
 profile zsysd @{exec_path} flags=(complain) {
   include <abstractions/base>
-  include <abstractions/bus/polkit>
+  include <abstractions/bus/org.freedesktop.PolicyKit1>
   include <abstractions/dbus-strict>
   include <abstractions/nameservice-strict>