Bugfix on name