Added ability to rename macros