Rename user scope to by_user