Use the new versioned macros instead of the generic ones.
They are already in the deprecated/ directory, the suffix is redundant, and there is no chance of collision.