diff --git a/profiles/apparmor/profiles/extras/usr.bin.chromium-browser b/profiles/apparmor/profiles/extras/chromium_browser
similarity index 100%
rename from profiles/apparmor/profiles/extras/usr.bin.chromium-browser
rename to profiles/apparmor/profiles/extras/chromium_browser
diff --git a/profiles/apparmor/profiles/extras/usr.lib.firefox.firefox b/profiles/apparmor/profiles/extras/firefox
similarity index 96%
rename from profiles/apparmor/profiles/extras/usr.lib.firefox.firefox
rename to profiles/apparmor/profiles/extras/firefox
index 6d869d674..051a4b45d 100644
--- a/profiles/apparmor/profiles/extras/usr.lib.firefox.firefox
+++ b/profiles/apparmor/profiles/extras/firefox
@@ -18,7 +18,7 @@ include <tunables/global>
 #  /usr/lib/firefox-4.0b8/firefox
 # but not:
 #  /usr/lib/firefox-4.0b8/firefox.sh
-/usr/lib/firefox{,-[0-9]*}/firefox{,*[^s][^h]} {
+profile firefox /usr/lib/firefox{,-[0-9]*}/firefox{,*[^s][^h]} {
   include <abstractions/audio>
   include <abstractions/cups-client>
   include <abstractions/dbus-session>
@@ -128,7 +128,6 @@ include <tunables/global>
   @{HOME}/.mozilla/firefox/*/gmp-widevinecdm/*/lib*so m,
 
   # Site-specific additions and overrides. See local/README for details.
-  # Local path is disabled, we only enable them for profiles we promote
-  # out of extras.
   include if exists <local/usr.bin.firefox>
+  include if exists <local/firefox>
 }
diff --git a/profiles/apparmor/profiles/extras/usr.lib.firefox.firefox.sh b/profiles/apparmor/profiles/extras/firefox.sh
similarity index 84%
rename from profiles/apparmor/profiles/extras/usr.lib.firefox.firefox.sh
rename to profiles/apparmor/profiles/extras/firefox.sh
index 3d8748eaa..352fa36cb 100644
--- a/profiles/apparmor/profiles/extras/usr.lib.firefox.firefox.sh
+++ b/profiles/apparmor/profiles/extras/firefox.sh
@@ -4,7 +4,7 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-/usr/lib/firefox/firefox.sh {
+profile firefox.sh /usr/lib/firefox/firefox.sh {
   include <abstractions/base>
   include <abstractions/bash>
   include <abstractions/consoles>
@@ -20,5 +20,5 @@ include <tunables/global>
   /usr/share/misc/magic.mgc r,
 
   # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/usr.lib.firefox.firefox.sh>
+  include if exists <local/firefox.sh>
 }