Fix Event Name tags