Some internal name fixes
Merge pull request #130 from hintjens/master

Some internal name fixes