switched to new key naming convention
Merge pull request #65 from c4ssio/master

switched to new key naming convention