diff --git a/apparmor.d/abstractions/bus/accessibility b/apparmor.d/abstractions/bus-accessibility
similarity index 93%
rename from apparmor.d/abstractions/bus/accessibility
rename to apparmor.d/abstractions/bus-accessibility
index eeb6f27f..4a5615f9 100644
--- a/apparmor.d/abstractions/bus/accessibility
+++ b/apparmor.d/abstractions/bus-accessibility
@@ -16,4 +16,4 @@
   owner @{run}/user/@{uid}/at-spi/bus rw,
   owner @{run}/user/@{uid}/at-spi/bus_@{int} rw,
 
-  include if exists <abstractions/bus/accessibility.d>
+  include if exists <abstractions/bus-accessibility.d>
diff --git a/apparmor.d/abstractions/bus/session b/apparmor.d/abstractions/bus-session
similarity index 95%
rename from apparmor.d/abstractions/bus/session
rename to apparmor.d/abstractions/bus-session
index 646dd416..ff571e8c 100644
--- a/apparmor.d/abstractions/bus/session
+++ b/apparmor.d/abstractions/bus-session
@@ -24,4 +24,4 @@
 
   owner @{run}/user/@{uid}/bus rw,
 
-  include if exists <abstractions/bus/session.d>
+  include if exists <abstractions/bus-session.d>
diff --git a/apparmor.d/abstractions/bus/system b/apparmor.d/abstractions/bus-system
similarity index 92%
rename from apparmor.d/abstractions/bus/system
rename to apparmor.d/abstractions/bus-system
index c88a72a5..0c6ec5b1 100644
--- a/apparmor.d/abstractions/bus/system
+++ b/apparmor.d/abstractions/bus-system
@@ -14,4 +14,4 @@
 
   @{run}/dbus/system_bus_socket rw,
 
-  include if exists <abstractions/bus/system.d>
+  include if exists <abstractions/bus-system.d>
diff --git a/apparmor.d/groups/gnome/evolution-alarm-notify b/apparmor.d/groups/gnome/evolution-alarm-notify
index a88dd5ac..939c18c2 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/accessibility>
+  include <abstractions/bus-accessibility>
+  include <abstractions/bus-session>
   include <abstractions/bus/org.a11y>
-  include <abstractions/bus/session>
   include <abstractions/dconf-write>
   include <abstractions/fontconfig-cache-read>
   include <abstractions/gnome-strict>
diff --git a/apparmor.d/groups/network/NetworkManager b/apparmor.d/groups/network/NetworkManager
index 2c7e92bb..04b9bd43 100644
--- a/apparmor.d/groups/network/NetworkManager
+++ b/apparmor.d/groups/network/NetworkManager
@@ -9,13 +9,13 @@ include <tunables/global>
 @{exec_path} = @{bin}/NetworkManager
 profile NetworkManager @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
+  include <abstractions/bus-system>
   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/profiles-a-f/cupsd b/apparmor.d/profiles-a-f/cupsd
index ebd286b6..ee0d8bf7 100644
--- a/apparmor.d/profiles-a-f/cupsd
+++ b/apparmor.d/profiles-a-f/cupsd
@@ -8,9 +8,9 @@ include <tunables/global>
 profile cupsd @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
   include <abstractions/authentication>
+  include <abstractions/bus-system>
   include <abstractions/bus/org.freedesktop.Avahi>
   include <abstractions/bus/org.freedesktop.ColorManager>
-  include <abstractions/bus/system>
   include <abstractions/nameservice-strict>
   include <abstractions/openssl>
   include <abstractions/python>
diff --git a/apparmor.d/profiles-s-z/vlc b/apparmor.d/profiles-s-z/vlc
index f943f0eb..702403a3 100644
--- a/apparmor.d/profiles-s-z/vlc
+++ b/apparmor.d/profiles-s-z/vlc
@@ -11,10 +11,10 @@ include <tunables/global>
 profile vlc @{exec_path} {
   include <abstractions/base>
   include <abstractions/audio>
-  include <abstractions/bus/accessibility>
+  include <abstractions/bus-accessibility>
+  include <abstractions/bus-session>
   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>