Ok, I pulled in and merged
the list from trivia asylum, whose main sources were
"Names and Nicknames of Places and Things" By: Laurence Urdang (ISBN: 0-246-13246-9)
"By Any Other Name" By: Michael D. Shook (ISBN: 0-671-86475-0)
That oughta do it for a while.