Bring some names in closer alignment with proposed standards.
Merge pull request #68 from PencilCode/keytweak

Bring some names in closer alignment with proposed standards.