Standardize usage of Keys
Merge pull request #32 from orta/keys

@ashfurrow => Standardise usage of Keys