Bugfixes, naming