Move 2.17's key renaming into 2.16
Merge pull request #61 from dimagi/update-key-names

Move 2.17's key renaming into 2.16