I could be wrong here, but I seem to remember reading somewhere that Avon and Afon are actually a remnant of the language of the people prior to the influence of Celtic culture, making it one of the oldest words in the English and Welsh languages.

I wonder how many more names survive from our ancestors pre-celtic languages?