Naming fixes, tests doesn't work right yet
Better naming, 

Better naming, @habib comments
Merge pull request #4 from EricSmekens/master

Better naming fix