Fixes partial commit after refactoring

Adds the other side of the refactoring of publish/subscribe function
names.