Fixing name problem