Better naming
Merge pull request #9 from gilt/8-naming

Better naming