Fixed the template events to work with the new naming scheme (no more _listener suffix).