I received a rather heartfelt e-mail from a user on our site explaining that Taiwan wasn't a province of China and that they wouldn't register until this was changed. Our site is made from a dozen or so valued contributors so we are going to change it. See issue here: http://www.iso.org/iso/country_codes/iso_3166-faqs/iso_3166_faqs_specific.htm.

I found the lines to edit in my CMS, but we have valued users from both China and Taiwan. I was wondering the most politically neutral way to amend my country codes.

What should the entries for China and Taiwan say?