fixed names
Merge pull request #14 from brianmcdonald/master

fixed names