Given that this issue involves renames, it's better to do this on a case-by-case basis on the article talk pages.
