From 7c684f9d22a6c448c5d38ed22f86ad9da01e6f2b Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Fri, 24 Nov 2023 18:52:09 -0800
Subject: [PATCH] profiles: convert local include to match profile name

The recently added unconfined profiles use the binary name for the
local include instead of the profile name. Switch to using the
profile name for the local include.

Signed-off-by: John Johansen <john.johansen@canonical.com>
---
 profiles/apparmor.d/1password            | 2 +-
 profiles/apparmor.d/Discord              | 2 +-
 profiles/apparmor.d/MongoDB_Compass      | 2 +-
 profiles/apparmor.d/QtWebEngineProcess   | 2 +-
 profiles/apparmor.d/brave                | 2 +-
 profiles/apparmor.d/buildah              | 2 +-
 profiles/apparmor.d/busybox              | 2 +-
 profiles/apparmor.d/cam                  | 2 +-
 profiles/apparmor.d/ch-checkns           | 2 +-
 profiles/apparmor.d/ch-run               | 2 +-
 profiles/apparmor.d/chrome               | 2 +-
 profiles/apparmor.d/code                 | 2 +-
 profiles/apparmor.d/crun                 | 2 +-
 profiles/apparmor.d/firefox              | 2 +-
 profiles/apparmor.d/flatpak              | 2 +-
 profiles/apparmor.d/github-desktop       | 2 +-
 profiles/apparmor.d/ipa_verify           | 2 +-
 profiles/apparmor.d/lc-compliance        | 2 +-
 profiles/apparmor.d/libcamerify          | 2 +-
 profiles/apparmor.d/linux-sandbox        | 2 +-
 profiles/apparmor.d/lxc-attach           | 2 +-
 profiles/apparmor.d/lxc-create           | 2 +-
 profiles/apparmor.d/lxc-destroy          | 2 +-
 profiles/apparmor.d/lxc-execute          | 2 +-
 profiles/apparmor.d/lxc-stop             | 2 +-
 profiles/apparmor.d/lxc-unshare          | 2 +-
 profiles/apparmor.d/lxc-usernsexec       | 2 +-
 profiles/apparmor.d/mmdebstrap           | 2 +-
 profiles/apparmor.d/msedge               | 2 +-
 profiles/apparmor.d/obsidian             | 2 +-
 profiles/apparmor.d/opera                | 2 +-
 profiles/apparmor.d/podman               | 2 +-
 profiles/apparmor.d/polypane             | 2 +-
 profiles/apparmor.d/qcam                 | 2 +-
 profiles/apparmor.d/rootlesskit          | 2 +-
 profiles/apparmor.d/rpm                  | 2 +-
 profiles/apparmor.d/runc                 | 2 +-
 profiles/apparmor.d/sbuild               | 2 +-
 profiles/apparmor.d/sbuild-abort         | 2 +-
 profiles/apparmor.d/sbuild-adduser       | 2 +-
 profiles/apparmor.d/sbuild-apt           | 2 +-
 profiles/apparmor.d/sbuild-checkpackages | 2 +-
 profiles/apparmor.d/sbuild-clean         | 2 +-
 profiles/apparmor.d/sbuild-createchroot  | 2 +-
 profiles/apparmor.d/sbuild-destroychroot | 2 +-
 profiles/apparmor.d/sbuild-distupgrade   | 2 +-
 profiles/apparmor.d/sbuild-hold          | 2 +-
 profiles/apparmor.d/sbuild-unhold        | 2 +-
 profiles/apparmor.d/sbuild-update        | 2 +-
 profiles/apparmor.d/sbuild-upgrade       | 2 +-
 profiles/apparmor.d/signal-desktop       | 2 +-
 profiles/apparmor.d/slack                | 2 +-
 profiles/apparmor.d/slirp4netns          | 2 +-
 profiles/apparmor.d/stress-ng            | 2 +-
 profiles/apparmor.d/thunderbird          | 2 +-
 profiles/apparmor.d/toybox               | 2 +-
 profiles/apparmor.d/trinity              | 2 +-
 profiles/apparmor.d/tup                  | 2 +-
 profiles/apparmor.d/userbindmount        | 2 +-
 profiles/apparmor.d/uwsgi-core           | 2 +-
 profiles/apparmor.d/vdens                | 2 +-
 profiles/apparmor.d/virtiofsd            | 2 +-
 profiles/apparmor.d/vivaldi-bin          | 2 +-
 profiles/apparmor.d/vpnns                | 2 +-
 profiles/apparmor.d/wpcom                | 2 +-
 65 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/profiles/apparmor.d/1password b/profiles/apparmor.d/1password
index 00365cffa..2cd14489d 100644
--- a/profiles/apparmor.d/1password
+++ b/profiles/apparmor.d/1password
@@ -8,5 +8,5 @@ profile 1password /opt/1Password/1password flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/opt.1Password.1password>
+  include if exists <local/1password>
 }
diff --git a/profiles/apparmor.d/Discord b/profiles/apparmor.d/Discord
index fcffafb8d..4e96b8fe7 100644
--- a/profiles/apparmor.d/Discord
+++ b/profiles/apparmor.d/Discord
@@ -8,5 +8,5 @@ profile Discord /usr/share/discord/Discord flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.share.discord.Discord>
+  include if exists <local/Discord>
 }
diff --git a/profiles/apparmor.d/MongoDB_Compass b/profiles/apparmor.d/MongoDB_Compass
index 473d2e119..6c796ca62 100644
--- a/profiles/apparmor.d/MongoDB_Compass
+++ b/profiles/apparmor.d/MongoDB_Compass
@@ -8,5 +8,5 @@ profile "MongoDB Compass" "/usr/lib/mongodb-compass/MongoDB Compass" flags=(unco
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.lib.mongodb-compass.MongoDB_Compass>
+  include if exists <local/MongoDB_Compass>
 }
diff --git a/profiles/apparmor.d/QtWebEngineProcess b/profiles/apparmor.d/QtWebEngineProcess
index fd0dbb31e..65dec4807 100644
--- a/profiles/apparmor.d/QtWebEngineProcess
+++ b/profiles/apparmor.d/QtWebEngineProcess
@@ -8,5 +8,5 @@ profile QtWebEngineProcess /usr/lib/@{multiarch}/qt{5,6}/libexec/QtWebEngineProc
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.lib.multiarch.qt5.libexec.QtWebEngineProcess>
+  include if exists <local/QtWebEngineProcess>
 }
diff --git a/profiles/apparmor.d/brave b/profiles/apparmor.d/brave
index 7535eee7a..4aba1a312 100644
--- a/profiles/apparmor.d/brave
+++ b/profiles/apparmor.d/brave
@@ -8,5 +8,5 @@ profile brave /opt/brave.com/brave/brave flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/opt.brave.com.brave.brave>
+  include if exists <local/brave>
 }
diff --git a/profiles/apparmor.d/buildah b/profiles/apparmor.d/buildah
index ae724603b..4281dc6c1 100644
--- a/profiles/apparmor.d/buildah
+++ b/profiles/apparmor.d/buildah
@@ -8,5 +8,5 @@ profile buildah /usr/bin/buildah flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.buildah>
+  include if exists <local/buildah>
 }
diff --git a/profiles/apparmor.d/busybox b/profiles/apparmor.d/busybox
index fe3b3c77f..d726ddf0a 100644
--- a/profiles/apparmor.d/busybox
+++ b/profiles/apparmor.d/busybox
@@ -8,5 +8,5 @@ profile busybox /usr/bin/busybox flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.busybox>
+  include if exists <local/busybox>
 }
diff --git a/profiles/apparmor.d/cam b/profiles/apparmor.d/cam
index 1150fdeb5..d56c55a0c 100644
--- a/profiles/apparmor.d/cam
+++ b/profiles/apparmor.d/cam
@@ -8,5 +8,5 @@ profile cam /usr/bin/cam flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.cam>
+  include if exists <local/cam>
 }
diff --git a/profiles/apparmor.d/ch-checkns b/profiles/apparmor.d/ch-checkns
index 07c587caa..eafb55686 100644
--- a/profiles/apparmor.d/ch-checkns
+++ b/profiles/apparmor.d/ch-checkns
@@ -8,5 +8,5 @@ profile ch-checkns /usr/bin/ch-checkns flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.ch-checkns>
+  include if exists <local/ch-checkns>
 }
diff --git a/profiles/apparmor.d/ch-run b/profiles/apparmor.d/ch-run
index d3c83258d..2d20b4391 100644
--- a/profiles/apparmor.d/ch-run
+++ b/profiles/apparmor.d/ch-run
@@ -8,5 +8,5 @@ profile ch-run /usr/bin/ch-run flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.ch-run>
+  include if exists <local/ch-run>
 }
diff --git a/profiles/apparmor.d/chrome b/profiles/apparmor.d/chrome
index d2970b271..085c19897 100644
--- a/profiles/apparmor.d/chrome
+++ b/profiles/apparmor.d/chrome
@@ -8,5 +8,5 @@ profile chrome /opt/google/chrome/chrome flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/opt.google.chrome.chrome>
+  include if exists <local/chrome>
 }
diff --git a/profiles/apparmor.d/code b/profiles/apparmor.d/code
index 8098749c8..0c70d50f9 100644
--- a/profiles/apparmor.d/code
+++ b/profiles/apparmor.d/code
@@ -8,5 +8,5 @@ profile code /usr/share/code/bin/code flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.share.code.bin.code>
+  include if exists <local/code>
 }
diff --git a/profiles/apparmor.d/crun b/profiles/apparmor.d/crun
index 34d5a22ad..04c9f4fdc 100644
--- a/profiles/apparmor.d/crun
+++ b/profiles/apparmor.d/crun
@@ -8,5 +8,5 @@ profile crun /usr/bin/crun flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.crun>
+  include if exists <local/crun>
 }
diff --git a/profiles/apparmor.d/firefox b/profiles/apparmor.d/firefox
index 255e4c571..670fa2118 100644
--- a/profiles/apparmor.d/firefox
+++ b/profiles/apparmor.d/firefox
@@ -8,5 +8,5 @@ profile firefox /usr/lib/firefox{,-esr}/firefox{,-esr} flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.lib.firefox.firefox>
+  include if exists <local/firefox>
 }
diff --git a/profiles/apparmor.d/flatpak b/profiles/apparmor.d/flatpak
index 1b1459e00..846978470 100644
--- a/profiles/apparmor.d/flatpak
+++ b/profiles/apparmor.d/flatpak
@@ -8,5 +8,5 @@ profile flatpak /usr/bin/flatpak flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.flatpak>
+  include if exists <local/flatpak>
 }
diff --git a/profiles/apparmor.d/github-desktop b/profiles/apparmor.d/github-desktop
index fba8c6fe0..d2c090874 100644
--- a/profiles/apparmor.d/github-desktop
+++ b/profiles/apparmor.d/github-desktop
@@ -8,5 +8,5 @@ profile github-desktop /usr/lib/github-desktop/github-desktop flags=(unconfined)
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.lib.github-desktop.github-desktop>
+  include if exists <local/github-desktop>
 }
diff --git a/profiles/apparmor.d/ipa_verify b/profiles/apparmor.d/ipa_verify
index 9b2dcb912..c9772422c 100644
--- a/profiles/apparmor.d/ipa_verify
+++ b/profiles/apparmor.d/ipa_verify
@@ -8,5 +8,5 @@ profile ipa_verify /usr/bin/ipa_verify flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.ipa_verify>
+  include if exists <local/ipa_verify>
 }
diff --git a/profiles/apparmor.d/lc-compliance b/profiles/apparmor.d/lc-compliance
index 76b467a4e..e7eb13ae0 100644
--- a/profiles/apparmor.d/lc-compliance
+++ b/profiles/apparmor.d/lc-compliance
@@ -8,5 +8,5 @@ profile lc-compliance /usr/bin/lc-compliance flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.lc-compliance>
+  include if exists <local/lc-compliance>
 }
diff --git a/profiles/apparmor.d/libcamerify b/profiles/apparmor.d/libcamerify
index 3523353af..3751b941c 100644
--- a/profiles/apparmor.d/libcamerify
+++ b/profiles/apparmor.d/libcamerify
@@ -8,5 +8,5 @@ profile libcamerify /usr/bin/libcamerify flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.libcamerify>
+  include if exists <local/libcamerify>
 }
diff --git a/profiles/apparmor.d/linux-sandbox b/profiles/apparmor.d/linux-sandbox
index f65535508..94f365a00 100644
--- a/profiles/apparmor.d/linux-sandbox
+++ b/profiles/apparmor.d/linux-sandbox
@@ -8,5 +8,5 @@ profile linux-sandbox /usr/libexec/@{multiarch}/bazel/linux-sandbox flags=(uncon
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.libexec.multiarch.bazel.linux-sandbox>
+  include if exists <local/linux-sandbox>
 }
diff --git a/profiles/apparmor.d/lxc-attach b/profiles/apparmor.d/lxc-attach
index c31cf4f74..f3846106a 100644
--- a/profiles/apparmor.d/lxc-attach
+++ b/profiles/apparmor.d/lxc-attach
@@ -8,5 +8,5 @@ profile lxc-attach /usr/bin/lxc-attach flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.lxc-attach>
+  include if exists <local/lxc-attach>
 }
diff --git a/profiles/apparmor.d/lxc-create b/profiles/apparmor.d/lxc-create
index 255137282..44c5038a0 100644
--- a/profiles/apparmor.d/lxc-create
+++ b/profiles/apparmor.d/lxc-create
@@ -8,5 +8,5 @@ profile lxc-create /usr/bin/lxc-create flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.lxc-create>
+  include if exists <local/lxc-create>
 }
diff --git a/profiles/apparmor.d/lxc-destroy b/profiles/apparmor.d/lxc-destroy
index 416a61c21..862b946fd 100644
--- a/profiles/apparmor.d/lxc-destroy
+++ b/profiles/apparmor.d/lxc-destroy
@@ -8,5 +8,5 @@ profile lxc-destroy /usr/bin/lxc-destroy flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.lxc-destroy>
+  include if exists <local/lxc-destroy>
 }
diff --git a/profiles/apparmor.d/lxc-execute b/profiles/apparmor.d/lxc-execute
index 81fc6abef..8629fa4da 100644
--- a/profiles/apparmor.d/lxc-execute
+++ b/profiles/apparmor.d/lxc-execute
@@ -8,5 +8,5 @@ profile lxc-execute /usr/bin/lxc-execute flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.lxc-execute>
+  include if exists <local/lxc-execute>
 }
diff --git a/profiles/apparmor.d/lxc-stop b/profiles/apparmor.d/lxc-stop
index 1a32dadf2..cb769df3e 100644
--- a/profiles/apparmor.d/lxc-stop
+++ b/profiles/apparmor.d/lxc-stop
@@ -8,5 +8,5 @@ profile lxc-stop /usr/bin/lxc-stop flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.lxc-stop>
+  include if exists <local/lxc-stop>
 }
diff --git a/profiles/apparmor.d/lxc-unshare b/profiles/apparmor.d/lxc-unshare
index 2e2834925..36ca0ea91 100644
--- a/profiles/apparmor.d/lxc-unshare
+++ b/profiles/apparmor.d/lxc-unshare
@@ -8,5 +8,5 @@ profile lxc-unshare /usr/bin/lxc-unshare flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.lxc-unshare>
+  include if exists <local/lxc-unshare>
 }
diff --git a/profiles/apparmor.d/lxc-usernsexec b/profiles/apparmor.d/lxc-usernsexec
index 21106e255..4295abcc7 100644
--- a/profiles/apparmor.d/lxc-usernsexec
+++ b/profiles/apparmor.d/lxc-usernsexec
@@ -8,5 +8,5 @@ profile lxc-usernsexec /usr/bin/lxc-usernsexec flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.lxc-usernsexec>
+  include if exists <local/lxc-usernsexec>
 }
diff --git a/profiles/apparmor.d/mmdebstrap b/profiles/apparmor.d/mmdebstrap
index b1519dafe..d7fea3c28 100644
--- a/profiles/apparmor.d/mmdebstrap
+++ b/profiles/apparmor.d/mmdebstrap
@@ -8,5 +8,5 @@ profile mmdebstrap /usr/bin/mmdebstrap flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.mmdebstrap>
+  include if exists <local/mmdebstrap>
 }
diff --git a/profiles/apparmor.d/msedge b/profiles/apparmor.d/msedge
index 95001a741..0e3a1b336 100644
--- a/profiles/apparmor.d/msedge
+++ b/profiles/apparmor.d/msedge
@@ -8,5 +8,5 @@ profile msedge /opt/microsoft/msedge/msedge flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/opt.microsoft.msedge.msedge>
+  include if exists <local/msedge>
 }
diff --git a/profiles/apparmor.d/obsidian b/profiles/apparmor.d/obsidian
index 4a07b98b7..3d6ef7f44 100644
--- a/profiles/apparmor.d/obsidian
+++ b/profiles/apparmor.d/obsidian
@@ -8,5 +8,5 @@ profile obsidian /opt/Obsidian/obsidian flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/opt.Obsidian.obsidian>
+  include if exists <local/obsidian>
 }
diff --git a/profiles/apparmor.d/opera b/profiles/apparmor.d/opera
index 64b45174a..cbf88c661 100644
--- a/profiles/apparmor.d/opera
+++ b/profiles/apparmor.d/opera
@@ -8,5 +8,5 @@ profile opera /usr/lib/@{multiarch}/opera/opera flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.lib.multiarch.opera.opera>
+  include if exists <local/opera>
 }
diff --git a/profiles/apparmor.d/podman b/profiles/apparmor.d/podman
index ce8c17769..54e29e220 100644
--- a/profiles/apparmor.d/podman
+++ b/profiles/apparmor.d/podman
@@ -8,5 +8,5 @@ profile podman /usr/bin/podman flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.podman>
+  include if exists <local/podman>
 }
diff --git a/profiles/apparmor.d/polypane b/profiles/apparmor.d/polypane
index 5344c93a3..ebe60e04d 100644
--- a/profiles/apparmor.d/polypane
+++ b/profiles/apparmor.d/polypane
@@ -8,5 +8,5 @@ profile polypane /opt/Polypane/polypane flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/opt.Polypane.polypane>
+  include if exists <local/polypane>
 }
diff --git a/profiles/apparmor.d/qcam b/profiles/apparmor.d/qcam
index 544319631..5da2f7bdd 100644
--- a/profiles/apparmor.d/qcam
+++ b/profiles/apparmor.d/qcam
@@ -8,5 +8,5 @@ profile qcam /usr/bin/qcam flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.qcam>
+  include if exists <local/qcam>
 }
diff --git a/profiles/apparmor.d/rootlesskit b/profiles/apparmor.d/rootlesskit
index 8ba2fc97b..d5f4ac963 100644
--- a/profiles/apparmor.d/rootlesskit
+++ b/profiles/apparmor.d/rootlesskit
@@ -8,5 +8,5 @@ profile rootlesskit /usr/bin/rootlesskit flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.rootlesskit>
+  include if exists <local/rootlesskit>
 }
diff --git a/profiles/apparmor.d/rpm b/profiles/apparmor.d/rpm
index ce7521612..04c95a629 100644
--- a/profiles/apparmor.d/rpm
+++ b/profiles/apparmor.d/rpm
@@ -8,5 +8,5 @@ profile rpm /usr/bin/rpm flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.rpm>
+  include if exists <local/rpm>
 }
diff --git a/profiles/apparmor.d/runc b/profiles/apparmor.d/runc
index af041bcf1..80444bcf9 100644
--- a/profiles/apparmor.d/runc
+++ b/profiles/apparmor.d/runc
@@ -8,5 +8,5 @@ profile runc /usr/sbin/runc flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.sbin.runc>
+  include if exists <local/runc>
 }
diff --git a/profiles/apparmor.d/sbuild b/profiles/apparmor.d/sbuild
index 64f5c2ef1..1b9bae999 100644
--- a/profiles/apparmor.d/sbuild
+++ b/profiles/apparmor.d/sbuild
@@ -8,5 +8,5 @@ profile sbuild /usr/bin/sbuild flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.sbuild>
+  include if exists <local/sbuild>
 }
diff --git a/profiles/apparmor.d/sbuild-abort b/profiles/apparmor.d/sbuild-abort
index 642dda5c4..b147d5b3b 100644
--- a/profiles/apparmor.d/sbuild-abort
+++ b/profiles/apparmor.d/sbuild-abort
@@ -8,5 +8,5 @@ profile sbuild-abort /usr/bin/sbuild-abort flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.sbuild-abort>
+  include if exists <local/sbuild-abort>
 }
diff --git a/profiles/apparmor.d/sbuild-adduser b/profiles/apparmor.d/sbuild-adduser
index 9ab664e6a..a7f1322ba 100644
--- a/profiles/apparmor.d/sbuild-adduser
+++ b/profiles/apparmor.d/sbuild-adduser
@@ -8,5 +8,5 @@ profile sbuild-adduser /usr/sbin/sbuild-adduser flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.sbin.sbuild-adduser>
+  include if exists <local/sbuild-adduser>
 }
diff --git a/profiles/apparmor.d/sbuild-apt b/profiles/apparmor.d/sbuild-apt
index e13e30633..0257e4574 100644
--- a/profiles/apparmor.d/sbuild-apt
+++ b/profiles/apparmor.d/sbuild-apt
@@ -8,5 +8,5 @@ profile sbuild-apt /usr/bin/sbuild-apt flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.sbuild-apt>
+  include if exists <local/sbuild-apt>
 }
diff --git a/profiles/apparmor.d/sbuild-checkpackages b/profiles/apparmor.d/sbuild-checkpackages
index 53d0f854f..aa52207eb 100644
--- a/profiles/apparmor.d/sbuild-checkpackages
+++ b/profiles/apparmor.d/sbuild-checkpackages
@@ -8,5 +8,5 @@ profile sbuild-checkpackages /usr/bin/sbuild-checkpackages flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.sbuild-checkpackages>
+  include if exists <local/sbuild-checkpackages>
 }
diff --git a/profiles/apparmor.d/sbuild-clean b/profiles/apparmor.d/sbuild-clean
index 72cdae804..c2ecc9cf7 100644
--- a/profiles/apparmor.d/sbuild-clean
+++ b/profiles/apparmor.d/sbuild-clean
@@ -8,5 +8,5 @@ profile sbuild-clean /usr/bin/sbuild-clean flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.sbuild-clean>
+  include if exists <local/sbuild-clean>
 }
diff --git a/profiles/apparmor.d/sbuild-createchroot b/profiles/apparmor.d/sbuild-createchroot
index ce371d367..e58b130c3 100644
--- a/profiles/apparmor.d/sbuild-createchroot
+++ b/profiles/apparmor.d/sbuild-createchroot
@@ -8,5 +8,5 @@ profile sbuild-createchroot /usr/bin/sbuild-createchroot flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.sbuild-createchroot>
+  include if exists <local/sbuild-createchroot>
 }
diff --git a/profiles/apparmor.d/sbuild-destroychroot b/profiles/apparmor.d/sbuild-destroychroot
index 49b52e9aa..217809723 100644
--- a/profiles/apparmor.d/sbuild-destroychroot
+++ b/profiles/apparmor.d/sbuild-destroychroot
@@ -8,5 +8,5 @@ profile sbuild-destroychroot /usr/sbin/sbuild-destroychroot flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.sbin.sbuild-destroychroot>
+  include if exists <local/sbuild-destroychroot>
 }
diff --git a/profiles/apparmor.d/sbuild-distupgrade b/profiles/apparmor.d/sbuild-distupgrade
index 0ff0faffd..c5c6f7dfd 100644
--- a/profiles/apparmor.d/sbuild-distupgrade
+++ b/profiles/apparmor.d/sbuild-distupgrade
@@ -8,5 +8,5 @@ profile sbuild-distupgrade /usr/bin/sbuild-distupgrade flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.sbuild-distupgrade>
+  include if exists <local/sbuild-distupgrade>
 }
diff --git a/profiles/apparmor.d/sbuild-hold b/profiles/apparmor.d/sbuild-hold
index da411c136..7f592f1cc 100644
--- a/profiles/apparmor.d/sbuild-hold
+++ b/profiles/apparmor.d/sbuild-hold
@@ -8,5 +8,5 @@ profile sbuild-hold /usr/bin/sbuild-hold flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.sbuild-hold>
+  include if exists <local/sbuild-hold>
 }
diff --git a/profiles/apparmor.d/sbuild-unhold b/profiles/apparmor.d/sbuild-unhold
index f4fa05422..c06f56deb 100644
--- a/profiles/apparmor.d/sbuild-unhold
+++ b/profiles/apparmor.d/sbuild-unhold
@@ -8,5 +8,5 @@ profile sbuild-unhold /usr/bin/sbuild-unhold flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.sbuild-unhold>
+  include if exists <local/sbuild-unhold>
 }
diff --git a/profiles/apparmor.d/sbuild-update b/profiles/apparmor.d/sbuild-update
index 1811960c6..dcca130df 100644
--- a/profiles/apparmor.d/sbuild-update
+++ b/profiles/apparmor.d/sbuild-update
@@ -8,5 +8,5 @@ profile sbuild-update /usr/bin/sbuild-update flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.sbuild-update>
+  include if exists <local/sbuild-update>
 }
diff --git a/profiles/apparmor.d/sbuild-upgrade b/profiles/apparmor.d/sbuild-upgrade
index 4e8c39058..be154b03e 100644
--- a/profiles/apparmor.d/sbuild-upgrade
+++ b/profiles/apparmor.d/sbuild-upgrade
@@ -8,5 +8,5 @@ profile sbuild-upgrade /usr/bin/sbuild-upgrade flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.sbuild-upgrade>
+  include if exists <local/sbuild-upgrade>
 }
diff --git a/profiles/apparmor.d/signal-desktop b/profiles/apparmor.d/signal-desktop
index 934a9d843..05738b995 100644
--- a/profiles/apparmor.d/signal-desktop
+++ b/profiles/apparmor.d/signal-desktop
@@ -8,5 +8,5 @@ profile signal-desktop /opt/Signal/signal-desktop flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/opt.Signal.signal-desktop>
+  include if exists <local/signal-desktop>
 }
diff --git a/profiles/apparmor.d/slack b/profiles/apparmor.d/slack
index 76f3ac579..158b3d3c7 100644
--- a/profiles/apparmor.d/slack
+++ b/profiles/apparmor.d/slack
@@ -8,5 +8,5 @@ profile slack /usr/lib/slack/slack flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.lib.slack.slack>
+  include if exists <local/slack>
 }
diff --git a/profiles/apparmor.d/slirp4netns b/profiles/apparmor.d/slirp4netns
index 90f483121..2a7d7a872 100644
--- a/profiles/apparmor.d/slirp4netns
+++ b/profiles/apparmor.d/slirp4netns
@@ -8,5 +8,5 @@ profile slirp4netns /usr/bin/slirp4netns flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.slirp4netns>
+  include if exists <local/slirp4netns>
 }
diff --git a/profiles/apparmor.d/stress-ng b/profiles/apparmor.d/stress-ng
index d88ca1861..314b81563 100644
--- a/profiles/apparmor.d/stress-ng
+++ b/profiles/apparmor.d/stress-ng
@@ -8,5 +8,5 @@ profile stress-ng /usr/bin/stress-ng flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.stress-ng>
+  include if exists <local/stress-ng>
 }
diff --git a/profiles/apparmor.d/thunderbird b/profiles/apparmor.d/thunderbird
index 042f6a5a0..060eb24da 100644
--- a/profiles/apparmor.d/thunderbird
+++ b/profiles/apparmor.d/thunderbird
@@ -8,5 +8,5 @@ profile thunderbird /usr/bin/thunderbird flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.thunderbird>
+  include if exists <local/thunderbird>
 }
diff --git a/profiles/apparmor.d/toybox b/profiles/apparmor.d/toybox
index 52698c33d..7921fd874 100644
--- a/profiles/apparmor.d/toybox
+++ b/profiles/apparmor.d/toybox
@@ -8,5 +8,5 @@ profile toybox /bin/toybox flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/bin.toybox>
+  include if exists <local/toybox>
 }
diff --git a/profiles/apparmor.d/trinity b/profiles/apparmor.d/trinity
index e9c20bb32..41e2346ad 100644
--- a/profiles/apparmor.d/trinity
+++ b/profiles/apparmor.d/trinity
@@ -8,5 +8,5 @@ profile trinity /usr/bin/trinity flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.trinity>
+  include if exists <local/trinity>
 }
diff --git a/profiles/apparmor.d/tup b/profiles/apparmor.d/tup
index 496ff3da7..482a0d326 100644
--- a/profiles/apparmor.d/tup
+++ b/profiles/apparmor.d/tup
@@ -8,5 +8,5 @@ profile tup /usr/bin/tup flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.tup>
+  include if exists <local/tup>
 }
diff --git a/profiles/apparmor.d/userbindmount b/profiles/apparmor.d/userbindmount
index 4ba21890d..406f494c7 100644
--- a/profiles/apparmor.d/userbindmount
+++ b/profiles/apparmor.d/userbindmount
@@ -8,5 +8,5 @@ profile userbindmount /usr/bin/userbindmount flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.userbindmount>
+  include if exists <local/userbindmount>
 }
diff --git a/profiles/apparmor.d/uwsgi-core b/profiles/apparmor.d/uwsgi-core
index 3f82d71e0..0ffcca5f8 100644
--- a/profiles/apparmor.d/uwsgi-core
+++ b/profiles/apparmor.d/uwsgi-core
@@ -8,5 +8,5 @@ profile uwsgi-core /usr/bin/uwsgi-core flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.uwsgi-core>
+  include if exists <local/uwsgi-core>
 }
diff --git a/profiles/apparmor.d/vdens b/profiles/apparmor.d/vdens
index 09dbcaaf4..643b29547 100644
--- a/profiles/apparmor.d/vdens
+++ b/profiles/apparmor.d/vdens
@@ -8,5 +8,5 @@ profile vdens /usr/bin/vdens flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.vdens>
+  include if exists <local/vdens>
 }
diff --git a/profiles/apparmor.d/virtiofsd b/profiles/apparmor.d/virtiofsd
index 1a0b10fdb..380a840de 100644
--- a/profiles/apparmor.d/virtiofsd
+++ b/profiles/apparmor.d/virtiofsd
@@ -8,5 +8,5 @@ profile virtiofsd /usr/libexec/virtiofsd flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.libexec.virtiofsd>
+  include if exists <local/virtiofsd>
 }
diff --git a/profiles/apparmor.d/vivaldi-bin b/profiles/apparmor.d/vivaldi-bin
index 22948cc9f..200c567dd 100644
--- a/profiles/apparmor.d/vivaldi-bin
+++ b/profiles/apparmor.d/vivaldi-bin
@@ -8,5 +8,5 @@ profile vivaldi-bin /opt/vivaldi/vivaldi-bin flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/opt.vivaldi.vivaldi-bin>
+  include if exists <local/vivaldi-bin>
 }
diff --git a/profiles/apparmor.d/vpnns b/profiles/apparmor.d/vpnns
index ee35f7fb6..8fea23718 100644
--- a/profiles/apparmor.d/vpnns
+++ b/profiles/apparmor.d/vpnns
@@ -8,5 +8,5 @@ profile vpnns /usr/bin/vpnns flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.bin.vpnns>
+  include if exists <local/vpnns>
 }
diff --git a/profiles/apparmor.d/wpcom b/profiles/apparmor.d/wpcom
index 2c35f2e19..301f37b80 100644
--- a/profiles/apparmor.d/wpcom
+++ b/profiles/apparmor.d/wpcom
@@ -8,5 +8,5 @@ profile wpcom /opt/WordPress.com/wpcom flags=(unconfined) {
   userns,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/opt.WordPress.com.wpcom>
+  include if exists <local/wpcom>
 }