After a long discussion, we're adding the prefectures/states for foreign cities. Auckland was put in as Auckland City, AUK, which means the city of Auckland in the Auckland state. But we're dropping the City name and just using the real city + state/prefecture. A lot of places have this already, like Germany, but the big country we are referencing here is Japan.
This came up after we talked about the Japanese shows, specifically Saitama-shi. -shi means City, so Saitama City would work. But they use that to just differentiate between the city of Saitama and the prefecture of Saitama. Adding the prefectures eliminates confusion, so that way we don't have to do Osaka City, Japan, for example. It's a headache but it seems to be the most correct way. It's just like the USA states.
Japan doesn't have an official abbreviation for prefectures...they are a very rare instance (only case?) where the country uses NUMBERS, like JA-11. So we took an unofficial list: http://www.statoids.com/ujp.html and are using that.