fix :ev-change & renamings