internal macro changes for reduced repetition
renaming for consistency