Several renamings.