Updating: renaming various macros