Final set of renamings