Changes names
Merge pull request #13 from WebWonders/NewNames---Pull

Change names