EtvUser is renamed to User everywhere