Naming bugfix