Corrected names and locations
Merge pull request #4 from EricAxel/master

Corrected names and locations