Fixing name issue