rename listener with subscriber when appropriate