Move listener, rename subscriber