Use standard macro names