renamed some assembly macros