Add some macros for compatibility
Bring back old names