Improved macro names