[EMAIL] Renamed to excisting code