Name hotfix