Unify spelling of "Key ID" and "User ID"
This spelling follows the spelling used in the relevant RFCs.