Rename
Move macro to the top