Rename and move macros.