some renamings in enumerators