Use more descriptive var names in the macros