fix macro names