Change User.name to User.username