FIx namespace for Event lib