diff --git a/apparmor.d/groups/systemd/systemd-generator-bless-boot b/apparmor.d/groups/systemd-generators/systemd-generator-bless-boot
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-bless-boot
rename to apparmor.d/groups/systemd-generators/systemd-generator-bless-boot
diff --git a/apparmor.d/groups/systemd/systemd-generator-cloud-init b/apparmor.d/groups/systemd-generators/systemd-generator-cloud-init
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-cloud-init
rename to apparmor.d/groups/systemd-generators/systemd-generator-cloud-init
diff --git a/apparmor.d/groups/systemd/systemd-generator-cryptsetup b/apparmor.d/groups/systemd-generators/systemd-generator-cryptsetup
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-cryptsetup
rename to apparmor.d/groups/systemd-generators/systemd-generator-cryptsetup
diff --git a/apparmor.d/groups/systemd/systemd-generator-debug b/apparmor.d/groups/systemd-generators/systemd-generator-debug
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-debug
rename to apparmor.d/groups/systemd-generators/systemd-generator-debug
diff --git a/apparmor.d/groups/systemd/systemd-generator-ds-identify b/apparmor.d/groups/systemd-generators/systemd-generator-ds-identify
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-ds-identify
rename to apparmor.d/groups/systemd-generators/systemd-generator-ds-identify
diff --git a/apparmor.d/groups/systemd/systemd-generator-environment-arch b/apparmor.d/groups/systemd-generators/systemd-generator-environment-arch
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-environment-arch
rename to apparmor.d/groups/systemd-generators/systemd-generator-environment-arch
diff --git a/apparmor.d/groups/systemd/systemd-generator-environment-flatpak b/apparmor.d/groups/systemd-generators/systemd-generator-environment-flatpak
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-environment-flatpak
rename to apparmor.d/groups/systemd-generators/systemd-generator-environment-flatpak
diff --git a/apparmor.d/groups/systemd/systemd-generator-friendly-recovery b/apparmor.d/groups/systemd-generators/systemd-generator-friendly-recovery
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-friendly-recovery
rename to apparmor.d/groups/systemd-generators/systemd-generator-friendly-recovery
diff --git a/apparmor.d/groups/systemd/systemd-generator-fstab b/apparmor.d/groups/systemd-generators/systemd-generator-fstab
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-fstab
rename to apparmor.d/groups/systemd-generators/systemd-generator-fstab
diff --git a/apparmor.d/groups/systemd/systemd-generator-getty b/apparmor.d/groups/systemd-generators/systemd-generator-getty
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-getty
rename to apparmor.d/groups/systemd-generators/systemd-generator-getty
diff --git a/apparmor.d/groups/systemd/systemd-generator-gpt-auto b/apparmor.d/groups/systemd-generators/systemd-generator-gpt-auto
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-gpt-auto
rename to apparmor.d/groups/systemd-generators/systemd-generator-gpt-auto
diff --git a/apparmor.d/groups/systemd/systemd-generator-hibernate-resume b/apparmor.d/groups/systemd-generators/systemd-generator-hibernate-resume
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-hibernate-resume
rename to apparmor.d/groups/systemd-generators/systemd-generator-hibernate-resume
diff --git a/apparmor.d/groups/systemd/systemd-generator-integritysetup b/apparmor.d/groups/systemd-generators/systemd-generator-integritysetup
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-integritysetup
rename to apparmor.d/groups/systemd-generators/systemd-generator-integritysetup
diff --git a/apparmor.d/groups/systemd/systemd-generator-ostree b/apparmor.d/groups/systemd-generators/systemd-generator-ostree
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-ostree
rename to apparmor.d/groups/systemd-generators/systemd-generator-ostree
diff --git a/apparmor.d/groups/systemd/systemd-generator-rc-local b/apparmor.d/groups/systemd-generators/systemd-generator-rc-local
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-rc-local
rename to apparmor.d/groups/systemd-generators/systemd-generator-rc-local
diff --git a/apparmor.d/groups/systemd/systemd-generator-run b/apparmor.d/groups/systemd-generators/systemd-generator-run
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-run
rename to apparmor.d/groups/systemd-generators/systemd-generator-run
diff --git a/apparmor.d/groups/systemd/systemd-generator-snapd b/apparmor.d/groups/systemd-generators/systemd-generator-snapd
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-snapd
rename to apparmor.d/groups/systemd-generators/systemd-generator-snapd
diff --git a/apparmor.d/groups/systemd/systemd-generator-sshd-socket b/apparmor.d/groups/systemd-generators/systemd-generator-sshd-socket
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-sshd-socket
rename to apparmor.d/groups/systemd-generators/systemd-generator-sshd-socket
diff --git a/apparmor.d/groups/systemd/systemd-generator-system-update b/apparmor.d/groups/systemd-generators/systemd-generator-system-update
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-system-update
rename to apparmor.d/groups/systemd-generators/systemd-generator-system-update
diff --git a/apparmor.d/groups/systemd/systemd-generator-sysv b/apparmor.d/groups/systemd-generators/systemd-generator-sysv
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-sysv
rename to apparmor.d/groups/systemd-generators/systemd-generator-sysv
diff --git a/apparmor.d/groups/systemd/systemd-generator-user-autostart b/apparmor.d/groups/systemd-generators/systemd-generator-user-autostart
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-user-autostart
rename to apparmor.d/groups/systemd-generators/systemd-generator-user-autostart
diff --git a/apparmor.d/groups/systemd/systemd-generator-user-environment b/apparmor.d/groups/systemd-generators/systemd-generator-user-environment
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-user-environment
rename to apparmor.d/groups/systemd-generators/systemd-generator-user-environment
diff --git a/apparmor.d/groups/systemd/systemd-generator-veritysetup b/apparmor.d/groups/systemd-generators/systemd-generator-veritysetup
similarity index 100%
rename from apparmor.d/groups/systemd/systemd-generator-veritysetup
rename to apparmor.d/groups/systemd-generators/systemd-generator-veritysetup