fixes names
Merge pull request #2 from dgoodman1224/naming

fixes names