Refactor old references to "activity" to more generic "listener".