Bugfixes and renaming