Fixing name bug