Replacing variable names in event_handler as well
Replace more event handlers
Replaced Publish handler with unique variables