Naming changes
Merge pull request #4 from mauroa/master

Naming changes