Minor Edits

Added some macros for common names.