Fix references to user.username to be user.name