Fixed Issue with Event Names