Events names changed, double quotes removed