some renamings