Neither ;)
The smoothest transition would come by adding new macros with new names,
then migrating all callers over then removing the old macros.
Preferably after leaving the old, unused macros in place for a kernel
cycle, but there's not much value in that unless we can make them emil
warnings when used, which isn't completely trivial.
Plus there is no sensible new name which we can use. Maybe you can think
of one, in which case that'd be a nice way to go.
I wouldn't consider a change like this before -rc1.
--