properly name things
Merge pull request #1 from GeekyGamer14/master

properly name things