Rio Grande City on the banks of the Rio Bravo. Makes perfect sense to me.
Rio Grande and Rio Bravo are both Spanish names.
The obvious compromise is to come up with an English name for the river.
I propose Wetback River.
About as much sense as Michigan City being in Indiana or Kansas city being in Missouri.