macro names changed to something sensible