Corrections of overly aggressive renamings.