Rename Some Macros