Bugfix in names