I believe I would just revert that change which introduced variable in profile name.
It was just a way to reduce small duplication, it's not critical at all. Change was made in the spirit of "RFC: using variables to make profiles more flexible" tread [0], but looks like we just need to wait a bit for the better tooling support.
[0] https://lists.ubuntu.com/archives/apparmor/2017-December/011350.html
