change to user from userName to be consistent