Fix a function declaration
Fix for Mac OS X
Fix module name
Refactor to easy english names