Merge pull request #4899 from RosettaCommons/dpaoliello/RenameAttributeMacros Rename attribute macros