Make macro name consistent