more consistent macro names