Fixing names
Merge pull request #583 from adminempire/master

Fixing names