Updated all macro names