Rename userName to username