Change names
Merge pull request #2 from buzzlightyear182/Naming

Change names