refactor macro names