Fixing problem with event names.