Merge pull request #1271 from tnull/rename_payee_struct