Bugfix: Name change