Yeah, "correct uncharged verbiage" is not the same as "the name that someone wants themselves called". So, I'm not going to call North Korea "Democratic People's Republic of Korea" because despite their preference for being called Democratic, they are not.

North Korea remains North Korea. CCP remains CCP. Blackwater remains Blackwater, not Akademi or Xe or whatever bloody thing they're called now. I'm not going to just go along with whatever rebranding their PR agency told them to do.