More edits from hackathon

Misc. changes to all branches (additions, new synonyms, a few
deprecations etc.)