More renaming is afoot.