Fixes names
Merge pull request #153 from WouterJ/final_fixes

Fixed names