Just to keep you updated, we're working ways for users to list their preferences for more accurate geocode lookups, but we are not looking at switching to GeoNames at this time. We feel that this will be a more powerful solution for all users.
To fix your immediate problem, you may want to look at code replacements or simple find and replace to correct the place names. Feel free to reach out to customer support if you need any assistance on this.
Thank you so much for your idea and feedback, Mathias!