Simple stuff -- pulling simple changes upstream

Mostly from account_cards.

I made a mistake and merged this into action_events prematurely.  Sorry about that, but these are mostly changes that shouldn't be controversial.  A lot of simple renaming.