XBT: Place of Birth: urgent help please

XBT et. al., the county i was born in china has changed to a different name recently. My question are: 1) should i use the current or old county name for I-485, G-325A forms? 2) I have a notarized birth certificate using the old county name? Is that OK or should i redo my birth certificate using the new county name?

If i fill I-485, G-325A forms using old county name and use the old brith certificate, they match, but not agree with the new county name.

Thanks a lot.