Small fixes & renames
Merge pull request #1 from tuetschek/master

Small fixes & renames