Fixed a bunch of errors
Merge pull request #1 from Kimundi/master

Fixed a bunch of errors - rename refactoring