EVaura: finish renaming