GPII-547: Better wiring of events/listeners/invokers/functions.
Also used more intuitive naming.