update keywords more consistent with general usage
Merge pull request #3 from mmckerns/master

update keywords more consistent with general usage