Fixed more naming
Merge pull request #38 from ArcBees/brandon-fixes

Fixed more naming