Added a couple of Macros for renaming members