Fine-tune the naming of new macros before merging into master.