renamed yaml keys
Merge pull request #377 from brendanwhitfield/master

renamed yaml keys