some vocab renamings