Follow up of massive rename/reorg.