update macro name scheme for consistency