Updated macro names for legibility