Renamed some utility classes. Implementing unregisterable custom event handlers.