Fix wrong macro names

These macros can be used with not only listener but also general
modules.