Update permission macros to the new names for things.